You can subscribe to this list here.
2009 |
Jan
|
Feb
(28) |
Mar
(85) |
Apr
(81) |
May
(32) |
Jun
(51) |
Jul
(134) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: <ale...@us...> - 2009-06-04 12:50:47
|
Revision: 236 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=236&view=rev Author: alexloewen Date: 2009-06-04 12:16:48 +0000 (Thu, 04 Jun 2009) Log Message: ----------- addet some funktionality to updateCourse.bpel inkl. xsl transformation from incoming data. Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Concurrent.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Input.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Output.xml Modified: trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa 2009-06-03 14:54:45 UTC (rev 235) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa 2009-06-04 12:16:48 UTC (rev 236) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="LSFClientAdapterCA" xmlns:ns10="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCategory" xmlns:ns11="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" xmlns:ns12="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCourse" xmlns:ns13="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" xmlns:ns14="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCourse" xmlns:ns15="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" xmlns:ns16="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns:ns17="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCategory" xmlns:ns18="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" xmlns:ns19="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" xmlns:ns2="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" xmlns:ns20="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:ns21="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse" xmlns:ns22="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" xmlns:ns23="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" xmlns:ns24="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:ns3="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" xmlns:ns4="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:ns5="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns6="urn:ilUserAdministration" xmlns:ns7="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" xmlns:ns8="http://cse.campussource.de/bpel/ILIASClientAdapter/Login" xmlns:ns9="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" xmlns:xlink="http://www.w3.org/2000/xlink"> +<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="LSFClientAdapterCA" xmlns:ns10="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCategory" xmlns:ns11="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" xmlns:ns12="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCourse" xmlns:ns13="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" xmlns:ns14="http://cse.campussource.de/bpel/ILIASClientAdapter/UpdateCourse" xmlns:ns15="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" xmlns:ns16="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns:ns17="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCategory" xmlns:ns18="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" xmlns:ns19="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" xmlns:ns2="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" xmlns:ns20="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:ns21="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse" xmlns:ns22="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" xmlns:ns23="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" xmlns:ns24="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:ns3="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" xmlns:ns4="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:ns5="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns6="urn:ilUserAdministration" xmlns:ns7="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" xmlns:ns8="http://cse.campussource.de/bpel/ILIASClientAdapter/Login" xmlns:ns9="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" xmlns:xlink="http://www.w3.org/2000/xlink"> <endpoints> <endpoint endpoint-name="casaPort1" interface-name="ns2:LSFClientAdapterPortType" name="endpoint1" service-name="ns1:casaService1"/> <endpoint endpoint-name="XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint2" service-name="ns3:XSLTTransformService"/> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Concurrent.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Concurrent.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Concurrent.properties 2009-06-04 12:16:48 UTC (rev 236) @@ -0,0 +1,13 @@ +calculatethroughput=false +#comparisontype's possible values: identical|binary|equals +comparisontype=identical +concurrentthreads=1 +description=testcase iliasAdapter_updateCourse +destination=http://localhost:${HttpDefaultPort}/ILIASClientAdapterService/ILIASClientAdapterPort +#featurestatus's possible values: progress|done +featurestatus=done +inputfile=Input.xml +invokesperthread=1 +outputfile=Output.xml +soapaction= +testtimeout=30 Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Input.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Input.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCourse/Input.xml 2009-06-04 12:16:48 UTC (rev 236) @@ -0,0 +1,57 @@ +<soapenv:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ili="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"> + <soapenv:Body> + <ili:processCourse> + <courseMessage> + <course> + <busId>?string?</busId> + <eventTime>?2008-09-29T03:49:45?</eventTime> + <!--Zero or more repetitions:--> +<!--- - - - - Attribute: type - - - - - --> + <attribute> + <name>type</name> + <value>Hauptseminar</value> + <transient>false</transient> + </attribute> +<!--- - - - - Attribute: title - - - - - --> + <attribute> + <name>title</name> + <value>Phonetische Aspekte des Russischem</value> + <transient>false</transient> + </attribute> +<!--- - - - - Attribute: shortDescription - - - - - --> + <attribute> + <name>shortDescription</name> + <value>kurze Beschreibung tested</value> + <transient>false</transient> + </attribute> +<!--- - - - - Attribute: abbreviation - - - - - --> + <attribute> + <name>abbreviation</name> + <value>PAS</value> + <transient>false</transient> + </attribute> +<!--- - - - - Attribute: languageFull - - - - - --> + <attribute> + <name>languageFull</name> + <value>deutsch</value> + <transient>false</transient> + </attribute> + <!--Optional:--> + <categories> + <!--Zero or more repetitions:--> + <category>?string?</category> + </categories> + <!--Optional:--> + <parent>?string?</parent> + <!--Optional:--> + <workgroups> + <!--Zero or more repetitions:--> + <workgroup>?string?</workgroup> + </workgroups> + </course> + <eventTime>?2004-02-14T19:44:14?</eventTime> + <event>UPDATE</event> + </courseMessage> + </ili:processCourse> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Modified: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties 2009-06-03 14:54:45 UTC (rev 235) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties 2009-06-04 12:16:48 UTC (rev 236) @@ -1 +1 @@ -testcases=IliasAdapter_addCategory +testcases=iliasAdapter_updateCourse This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-06-04 12:50:45
|
Revision: 237 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=237&view=rev Author: alexloewen Date: 2009-06-04 12:16:57 +0000 (Thu, 04 Jun 2009) Log Message: ----------- addet some funktionality to updateCourse.bpel inkl. xsl transformation from incoming data. Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/updateCourseXSLT.xsl Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel 2009-06-04 12:16:48 UTC (rev 236) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel 2009-06-04 12:16:57 UTC (rev 237) @@ -1,17 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <process name="UpdateCourse" - targetNamespace="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCourse" + targetNamespace="http://cse.campussource.de/bpel/ILIASClientAdapter/UpdateCourse" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" - xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCourse"> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions" + xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:il_crs="http://cse.campussource.de/schema/ilias/course" + xmlns:il_objs="http://cse.campussource.de/schema/ilias/objects" + xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/UpdateCourse" xmlns:ns1="http://cse.campussource.de/schema/DataTypes"> + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/ilias/course" location="ilias-course.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/DataTypes" location="Common/CDDM.xsd" importType="http://www.w3.org/2001/XMLSchema"/> <partnerLinks> <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" partnerLinkType="tns:UpdateCourse" myRole="UpdateCoursePortTypeRole"/> @@ -21,20 +28,61 @@ <variable name="UpdateILIASCourseIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:updateCourseRequest"/> <variable name="UpdateCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseResponse"/> <variable name="UpdateCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseRequest"/> + <variable name="CourseXML" element="il_crs:Course"/> </variables> <sequence> <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="updateCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" portType="tns:UpdateCoursePortType" variable="UpdateCourseIn"/> - <assign name="Assign2"> + <assign name="prepareForGettingCourseData"> <copy> <from variable="UpdateCourseIn" part="SID"/> <to variable="UpdateILIASCourseIn" part="sid"/> </copy> <copy> - <from>182</from> + <from>49</from> <to variable="UpdateILIASCourseIn" part="course_id"/> </copy> </assign> + <!-- Initialize course xml skeleton + <assign name="initializeCourseXML"> + <copy> + <from> + <literal> + <Course xmlns="http://cse.campussource.de/schema/ilias/course"> + <MetaData xmlns="http://cse.campussource.de/schema/ilias/course"> + <General> + <Title Language="en">testcourseE</Title> + <Language Language="en">deutschFalsch</Language> + <Description Language="en">bpel test war falsch</Description> + </General> + </MetaData> + </Course> + </literal> + </from> + <to variable="CourseXML"/> + </copy> + </assign> --> + + <assign name="copyTheActualDataToCourseXML"> + <copy> + <from>ns0:doXslTransform('urn:stylesheets:updateCourseXSLT.xsl', $UpdateCourseIn.course)</from> + <to variable="CourseXML"/> + </copy> + + </assign> + + <assign name="marshalCourseXML"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <ns0:from>concat('*** CourseXML: ', $CourseXML)</ns0:from> + </sxt:log> + </sxt:trace> + <copy> + <from>sxxf:doMarshal($CourseXML)</from> + <to variable="UpdateILIASCourseIn" part="xml"/> + </copy> + </assign> <invoke name="UpdateLectureInvoke" partnerLink="ILIAS" operation="updateCourse" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="UpdateILIASCourseIn" outputVariable="UpdateILIASCourseOut"/> + <assign name="prepareReply"> <copy> <from variable="UpdateILIASCourseOut" part="success"/> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/updateCourseXSLT.xsl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/updateCourseXSLT.xsl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/updateCourseXSLT.xsl 2009-06-04 12:16:57 UTC (rev 237) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Document : updateCourseXSLT.xsl + Created on : 3. Juni 2009, 11:47 + Author : alex + Description: + updateCourseXSLT.xsl is used by updateCourse.bpel. It transforms LSF + courseMessage to Ilias CourseXML +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:il_objects="http://cse.campussource.de/schema/ilias/objects" + xmlns="http://cse.campussource.de/schema/ilias/objects" + version="1.0"> + <xsl:output method="xml" + media-type="text/xml" + omit-xml-declaration="yes"/> + + <xsl:template match="/"> + <Course xmlns="http://cse.campussource.de/schema/ilias/course"> + <MetaData xmlns="http://cse.campussource.de/schema/ilias/course"> + <General> + <xsl:apply-templates /> + </General> + </MetaData> + </Course> + </xsl:template> + + <xsl:template match="attribute"> + <xsl:if test="name='title'"> + <Title Language="En"> + <xsl:value-of select="./value" /> + </Title> + </xsl:if> + <xsl:if test="name='shortDescription'"> + <Description Language="En"> + <xsl:value-of select="./value" /> + </Description> + </xsl:if> + <xsl:if test="name='languageFull'"> + <Language Language="En"> + <xsl:value-of select="./value" /> + </Language> + </xsl:if> + </xsl:template> + + <xsl:template match="busId"> + </xsl:template> + + <xsl:template match="eventTime"> + </xsl:template> + + <xsl:template match="category"> + </xsl:template> + + <xsl:template match="workgroups"> + </xsl:template> + <xsl:template match="categories"> + </xsl:template> + + <xsl:template match="workgroup"> + </xsl:template> + <xsl:template match="parent"> + </xsl:template> +</xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-06-03 14:54:48
|
Revision: 234 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=234&view=rev Author: pkasprzak Date: 2009-06-03 14:54:38 +0000 (Wed, 03 Jun 2009) Log Message: ----------- * Generate replies (does not work for now...) Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel 2009-06-03 14:53:32 UTC (rev 233) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel 2009-06-03 14:54:38 UTC (rev 234) @@ -9,7 +9,25 @@ xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" xmlns:tns="http://enterprise.netbeans.org/bpel/ObjectProcessor/ReplyProcessor"> + <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" location="ReplyProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="ClientAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" partnerLinkType="tns:ReplyProcessor" myRole="ReplyProcessorPortTypeRole"/> + </partnerLinks> + <variables> + <variable name="ProcessReplyIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" messageType="tns:processReplyRequest"/> + </variables> + <sequence> + <receive name="start" createInstance="yes" partnerLink="ClientAdapter" operation="processReply" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" + portType="tns:ReplyProcessorPortType" + variable="ProcessReplyIn"/> - <sequence> - </sequence> + <empty> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Recieved reply: ', '$ProcessReplyIn.reply')</from> + </sxt:log> + </sxt:trace> + </empty> + </sequence> </process> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-06-03 14:54:47
|
Revision: 235 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=235&view=rev Author: pkasprzak Date: 2009-06-03 14:54:45 +0000 (Wed, 03 Jun 2009) Log Message: ----------- * Generate replies (does not work for now...) Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-06-03 14:54:38 UTC (rev 234) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-06-03 14:54:45 UTC (rev 235) @@ -80,6 +80,9 @@ <variable name="SID" type="xsd:string"/> <!-- Reply vars --> + <variable name="STATUS_SUCCESS" type="xsd:string"/> + <variable name="STATUS_FAILURE" type="xsd:string"/> + <variable name="ObjectBusId" type="xsd:int"/> <variable name="ObjectClientId" type="xsd:string"/> <variable name="ReplyStatus" type="dt:statusType"/> @@ -110,16 +113,23 @@ <from variable="LoginOut" part="SID"/> <to variable="SID"/> </copy> -<!-- <copy> <from>$ProcessCourseOperationIn.courseMessage/course/busId</from> <to>$ObjectBusId</to> </copy> ---> <copy ignoreMissingFromData="yes"> <from>$ProcessCourseOperationIn.courseMessage/course/attribute[name = 'clientId']/value</from> <to>$ObjectClientId</to> </copy> + <!-- Init constants (better alternatives?) --> + <copy> + <from>'SUCCESS'</from> + <to>$STATUS_SUCCESS</to> + </copy> + <copy> + <from>'FAILURE'</from> + <to>$STATUS_FAILURE</to> + </copy> </assign> <!-- Branch on different events --> @@ -154,6 +164,32 @@ portType="tns:AddCoursePortType" inputVariable="AddCourseIn" outputVariable="AddCourseOut"/> + + <assign name="saveCourseId"> + <copy> + <from>string($AddCourseOut.courseId)</from> + <to>$ObjectClientId</to> + </copy> + </assign> + + <if> + <condition>$AddCourseOut.courseId != 0</condition> + <assign name="addCourseSuccess"> + <copy> + <from>$STATUS_SUCCESS</from> + <to>$ReplyStatus</to> + </copy> + </assign> + <else> + <assign name="addCourseFailure"> + <copy> + <from>$STATUS_FAILURE</from> + <to>$ReplyStatus</to> + </copy> + </assign> + </else> + </if> + </sequence> <elseif> <!-- Event == "UPDATE" --> @@ -180,6 +216,24 @@ portType="tns:UpdateCoursePortType" inputVariable="UpdateCourseIn" outputVariable="UpdateCourseOut"/> + + <if> + <condition>$UpdateCourseOut.success</condition> + <assign name="updateCourseSuccess"> + <copy> + <from>$STATUS_SUCCESS</from> + <to>$ReplyStatus</to> + </copy> + </assign> + <else> + <assign name="updateCourseFailure"> + <copy> + <from>$STATUS_FAILURE</from> + <to>$ReplyStatus</to> + </copy> + </assign> + </else> + </if> </sequence> </elseif> <elseif> @@ -207,6 +261,24 @@ portType="tns:DeleteCoursePortType" inputVariable="DeleteCourseIn" outputVariable="DeleteCourseOut"/> + + <if> + <condition>$DeleteCourseOut.success</condition> + <assign name="deleteCourseSuccess"> + <copy> + <from>$STATUS_SUCCESS</from> + <to>$ReplyStatus</to> + </copy> + </assign> + <else> + <assign name="deleteCourseFailure"> + <copy> + <from>$STATUS_FAILURE</from> + <to>$ReplyStatus</to> + </copy> + </assign> + </else> + </if> </sequence> </elseif> <else> @@ -239,11 +311,29 @@ portType="tns:LoginPortType" inputVariable="LoginIn" outputVariable="LoginOut"/> - <assign name="saveSIDForCategories"> + + <assign name="initCategoryProcessing"> <copy> <from variable="LoginOut" part="SID"/> <to variable="SID"/> </copy> + <copy> + <from>$ProcessCategoryOperationIn.categoryMessage/category/busId</from> + <to>$ObjectBusId</to> + </copy> + <copy ignoreMissingFromData="yes"> + <from>$ProcessCategoryOperationIn.categoryMessage/category/attribute[name = 'clientId']/value</from> + <to>$ObjectClientId</to> + </copy> + <!-- Init constants (better alternatives?) --> + <copy> + <from>'SUCCESS'</from> + <to>$STATUS_SUCCESS</to> + </copy> + <copy> + <from>'FAILURE'</from> + <to>$STATUS_FAILURE</to> + </copy> </assign> <!-- Branch on different events --> @@ -277,6 +367,31 @@ portType="tns:AddCategoryPortType" inputVariable="AddCategoryIn" outputVariable="AddCategoryOut"/> + + <assign name="saveCategoryId"> + <copy> + <from>string($AddCategoryOut.categoryId)</from> + <to>$ObjectClientId</to> + </copy> + </assign> + + <if> + <condition>$AddCategoryOut.categoryId != 0</condition> + <assign name="addCategorySuccess"> + <copy> + <from>$STATUS_SUCCESS</from> + <to>$ReplyStatus</to> + </copy> + </assign> + <else> + <assign name="addCategoryFailure"> + <copy> + <from>$STATUS_FAILURE</from> + <to>$ReplyStatus</to> + </copy> + </assign> + </else> + </if> </sequence> <elseif> <!-- Event == "UPDATE" --> @@ -297,11 +412,31 @@ <to>$UpdateCategoryIn.SID</to> </copy> </assign> + <invoke name="updateCategory" partnerLink="UpdateCategory" operation="updateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" portType="tns:UpdateCategoryPortType" inputVariable="UpdateCategoryIn" outputVariable="UpdateCategoryOut"/> + + <if> + <condition>$UpdateCategoryOut.success</condition> + <assign name="updateCategorySuccess"> + <copy> + <from>$STATUS_SUCCESS</from> + <to>$ReplyStatus</to> + </copy> + </assign> + <else> + <assign name="updateCategoryFailure"> + <copy> + <from>$STATUS_FAILURE</from> + <to>$ReplyStatus</to> + </copy> + </assign> + </else> + </if> + </sequence> </elseif> <elseif> @@ -328,6 +463,25 @@ portType="tns:DeleteCategoryPortType" inputVariable="DeleteCategoryIn" outputVariable="DeleteCategoryOut"/> + + <if> + <condition>$DeleteCategoryOut.success</condition> + <assign name="deleteCategorySuccess"> + <copy> + <from>$STATUS_SUCCESS</from> + <to>$ReplyStatus</to> + </copy> + </assign> + <else> + <assign name="deleteCategoryFailure"> + <copy> + <from>$STATUS_FAILURE</from> + <to>$ReplyStatus</to> + </copy> + </assign> + </else> + </if> + </sequence> </elseif> <else> @@ -366,6 +520,11 @@ <!-- Generate reply(s) --> <assign name="prepareReply"> + <sxt:trace> + <sxt:log level="info" location="onComplete"> + <from>concat('*** Reply: ', $ProcessReplyIn.reply, 'END')</from> + </sxt:log> + </sxt:trace> <copy> <from> <literal> @@ -382,9 +541,32 @@ </copy> </assign> +<!-- + <assign> + <copy> + <from>$ObjectBusId</from> + <to>$ProcessReplyIn.reply/objectBusId</to> + </copy> + + <copy> + <from>$ObjectClientId</from> + <to>$ProcessReplyIn.reply/objectClientId</to> + </copy> + <copy> + <from>$ReplyStatus</from> + <to>$ProcessReplyIn.reply/replyStatus</to> + </copy> + <copy> + <from>sxxf:current-time()</from> + <to>$ProcessReplyIn.reply/replyTime</to> + </copy> + + </assign> + <invoke name="returnReply" partnerLink="ReplyProcessor" operation="processReply" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" portType="tns:ReplyProcessorPortType" inputVariable="ProcessReplyIn"/> +--> </sequence> </process> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-06-03 14:53:34
|
Revision: 233 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=233&view=rev Author: pkasprzak Date: 2009-06-03 14:53:32 +0000 (Wed, 03 Jun 2009) Log Message: ----------- * Unneeded for now Removed Paths: ------------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel Deleted: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel 2009-06-03 14:05:12 UTC (rev 232) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel 2009-06-03 14:53:32 UTC (rev 233) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<process - name="OutboundObjectProcessor" - targetNamespace="http://enterprise.netbeans.org/bpel/ObjectProcessor/OutboundObjectProcessor" - xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" - xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" - xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" - xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" - xmlns:tns="http://enterprise.netbeans.org/bpel/ObjectProcessor/OutboundObjectProcessor"> - - <sequence> - </sequence> -</process> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-06-03 14:05:15
|
Revision: 232 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=232&view=rev Author: pkasprzak Date: 2009-06-03 14:05:12 +0000 (Wed, 03 Jun 2009) Log Message: ----------- * Substituted "xs:ID" / "xs:IDREF" with "xs:int" (xs:IDs are derived from XML NCNAMEs != numerical ids) Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd Modified: trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-05-29 14:46:14 UTC (rev 231) +++ trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-06-03 14:05:12 UTC (rev 232) @@ -16,17 +16,17 @@ <!-- Entity State und StateTime --> <xs:complexType name="entityType"> <xs:sequence> - <xs:element name="busId" type="xs:ID"/> - <xs:element name="eventTime" type="xs:dateTime"/> - <xs:element name="attribute" type="tns:attributeType" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="busId" type="xs:int"/> + <xs:element name="eventTime" type="xs:dateTime"/> + <xs:element name="attribute" type="tns:attributeType" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> <xs:complexType name="attributeType"> <xs:sequence> - <xs:element name="name" type="xs:string"/> - <xs:element name="value" type="xs:string"/> - <xs:element name="transient" type="xs:boolean" /> + <xs:element name="name" type="xs:string"/> + <xs:element name="value" type="xs:string"/> + <xs:element name="transient" type="xs:boolean" /> </xs:sequence> </xs:complexType> @@ -37,15 +37,15 @@ <xs:element name="categories" minOccurs="0" > <xs:complexType> <xs:sequence> - <xs:element name="category" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="category" type="xs:int" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="parent" type="xs:IDREF" minOccurs="0"/> + <xs:element name="parent" type="xs:int" minOccurs="0"/> <xs:element name="workgroups" minOccurs="0"> <xs:complexType> <xs:sequence> - <xs:element name="workgroup" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="workgroup" type="xs:int" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> @@ -58,18 +58,18 @@ <xs:complexContent> <xs:extension base="tns:entityType"> <xs:sequence> - <xs:element name="parent" type="xs:IDREF" minOccurs="0"/> + <xs:element name="parent" type="xs:int" minOccurs="0"/> <xs:element name="categories" minOccurs="0"> <xs:complexType> <xs:sequence> - <xs:element name="category" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="category" type="xs:int" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="courses" minOccurs="0"> <xs:complexType> <xs:sequence> - <xs:element name="course" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="course" type="xs:int" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> @@ -117,14 +117,14 @@ <xs:simpleType name="statusType"> <xs:restriction base="xs:string"> <xs:enumeration value="SUCCESS"/> - <xs:enumeration value="ERROR"/> + <xs:enumeration value="FAILURE"/> </xs:restriction> </xs:simpleType> <!-- New Type --> <xs:complexType name="eventReplyMessageType"> <xs:sequence> - <xs:element name="objectBusId" type="xs:ID"/> + <xs:element name="objectBusId" type="xs:int"/> <xs:element name="objectClientId" type="xs:string"/> <xs:element name="replyTime" type="xs:dateTime"/> <xs:element name="replyStatus" type="tns:statusType"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-29 14:46:16
|
Revision: 231 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=231&view=rev Author: pkasprzak Date: 2009-05-29 14:46:14 +0000 (Fri, 29 May 2009) Log Message: ----------- * Unfinished stuff Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd Modified: trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-05-29 14:46:07 UTC (rev 230) +++ trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-05-29 14:46:14 UTC (rev 231) @@ -4,10 +4,12 @@ targetNamespace="http://cse.campussource.de/schema/DataTypes" version="1.0"> - <xs:element name="category" type="tns:categoryType"/> - <xs:element name="course" type="tns:courseType"/> - <xs:element name="courseMessage" type="tns:courseMessageType"/> - <xs:element name="categoryMessage" type="tns:categoryMessageType"/> + <xs:element name="category" type="tns:categoryType"/> + <xs:element name="course" type="tns:courseType"/> + <xs:element name="courseMessage" type="tns:courseMessageType"/> + <xs:element name="categoryMessage" type="tns:categoryMessageType"/> + <xs:element name="eventReplyMessage" type="tns:eventReplyMessageType"/> + <xs:element name="status" type="tns:statusType"/> <!-- <xs:element name="eventMessage" type="tns:eventMessageType"/> --> @@ -125,7 +127,7 @@ <xs:element name="objectBusId" type="xs:ID"/> <xs:element name="objectClientId" type="xs:string"/> <xs:element name="replyTime" type="xs:dateTime"/> - <xs:element name="status" type="tns:statusType"/> + <xs:element name="replyStatus" type="tns:statusType"/> <xs:element name="info" type="xs:string"/> </xs:sequence> </xs:complexType> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-29 14:46:12
|
Revision: 230 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=230&view=rev Author: pkasprzak Date: 2009-05-29 14:46:07 +0000 (Fri, 29 May 2009) Log Message: ----------- * Unfinished stuff Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel Modified: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel 2009-05-29 14:46:01 UTC (rev 229) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel 2009-05-29 14:46:07 UTC (rev 230) @@ -19,7 +19,7 @@ <import namespace="http://cse.campussource.de/schema/LSFDataTypes" location="LSFDataTypes.xsd" importType="http://www.w3.org/2001/XMLSchema"/> <import namespace="http://cse.campussource.de/schema/DataTypes" location="Common/CDDM.xsd" importType="http://www.w3.org/2001/XMLSchema"/> <import namespace="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" location="XSLTTransform.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" location="ObjectProcessor/ObjectProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" location="ObjectProcessor/InboundObjectProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> <partnerLink name="XSLTTransform" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" partnerLinkType="tns:XSLTTransform" partnerRole="XSLTTransformPortTypeRole"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-29 14:46:08
|
Revision: 229 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=229&view=rev Author: pkasprzak Date: 2009-05-29 14:46:01 +0000 (Fri, 29 May 2009) Log Message: ----------- * Unfinished stuff Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-29 14:45:37 UTC (rev 228) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-29 14:46:01 UTC (rev 229) @@ -12,20 +12,24 @@ xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions" xmlns:il_crs="http://cse.campussource.de/schema/ilias/course" xmlns:il_objs="http://cse.campussource.de/schema/ilias/objects" + xmlns:dt="http://cse.campussource.de/schema/DataTypes" xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter"> - <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" location="ILIASClientAdapter.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://cse.campussource.de/schema/ilias/course" location="ilias-course.xsd" importType="http://www.w3.org/2001/XMLSchema"/> - <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" location="Login.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" location="AddCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" location="UpdateCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/DataTypes" location="Common/CDDM.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" location="ILIASClientAdapter.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/ilias/course" location="ilias-course.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" location="Login.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" location="AddCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" location="UpdateCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" location="ObjectProcessor/ReplyProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> <partnerLink name="Login" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" partnerLinkType="tns:Login" partnerRole="LoginPortTypeRole"/> @@ -41,6 +45,8 @@ partnerRole="UpdateCategoryPortTypeRole"/> <partnerLink name="DeleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" partnerLinkType="tns:DeleteCategory" partnerRole="DeleteCategoryPortTypeRole"/> + <partnerLink name="ReplyProcessor" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" partnerLinkType="tns:ReplyProcessor" + partnerRole="ReplyProcessorPortTypeRole"/> <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> <partnerLink name="ILIASAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" partnerLinkType="tns:ILIASClientAdapter" @@ -49,6 +55,7 @@ <variables> <!-- Messages --> + <variable name="ProcessReplyIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" messageType="tns:processReplyRequest"/> <variable name="DeleteCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryResponse"/> <variable name="DeleteCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest"/> <variable name="UpdateCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryResponse"/> @@ -69,11 +76,14 @@ <variable name="LogoutOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:logoutResponse"/> <variable name="LogoutIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:logoutRequest"/> - <!-- Ilias --> - <!-- Ilias session id --> <variable name="SID" type="xsd:string"/> + <!-- Reply vars --> + <variable name="ObjectBusId" type="xsd:int"/> + <variable name="ObjectClientId" type="xsd:string"/> + <variable name="ReplyStatus" type="dt:statusType"/> + </variables> <sequence> @@ -95,11 +105,21 @@ portType="tns:LoginPortType" inputVariable="LoginIn" outputVariable="LoginOut"/> - <assign name="saveSIDForCourses"> + <assign name="initCourseProcessing"> <copy> <from variable="LoginOut" part="SID"/> <to variable="SID"/> </copy> +<!-- + <copy> + <from>$ProcessCourseOperationIn.courseMessage/course/busId</from> + <to>$ObjectBusId</to> + </copy> +--> + <copy ignoreMissingFromData="yes"> + <from>$ProcessCourseOperationIn.courseMessage/course/attribute[name = 'clientId']/value</from> + <to>$ObjectClientId</to> + </copy> </assign> <!-- Branch on different events --> @@ -332,6 +352,7 @@ <to variable="LogoutIn" part="sid"/> </copy> </assign> + <invoke name="logout" partnerLink="ILIAS" operation="logout" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="LogoutIn" @@ -342,5 +363,28 @@ </sxt:log> </sxt:trace> </invoke> + + <!-- Generate reply(s) --> + <assign name="prepareReply"> + <copy> + <from> + <literal> + <reply xmlns="http://cse.campussource.de/schema/DataTypes"> + <objectBusId/> + <objectClientId/> + <replyTime/> + <replyStatus/> + <info/> + </reply> + </literal> + </from> + <to>$ProcessReplyIn.reply</to> + </copy> + </assign> + + <invoke name="returnReply" partnerLink="ReplyProcessor" operation="processReply" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" + portType="tns:ReplyProcessorPortType" + inputVariable="ProcessReplyIn"/> </sequence> </process> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-29 14:45:44
|
Revision: 228 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=228&view=rev Author: pkasprzak Date: 2009-05-29 14:45:37 +0000 (Fri, 29 May 2009) Log Message: ----------- * Unfinished stuff Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.bpel trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.wsdl trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.wsdl Removed Paths: ------------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl Property Changed: ---------------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/ Property changes on: trunk/sandbox/lsf-adapter-demo/ObjectProcessor ___________________________________________________________________ Added: svn:ignore + build Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml 2009-05-29 13:22:48 UTC (rev 227) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml 2009-05-29 14:45:37 UTC (rev 228) @@ -53,18 +53,14 @@ properties which you can use check the target you are overriding in nbproject/build-impl.xml file. --> - <target name="-check-netbeans-home"> - <condition property="no.netbeans.home"> - <not> - <isset property="netbeans.home"/> - </not> - </condition> + <target name="-init-esb-ide" if="netbeans.home"> + <property name="esb.netbeans.platform" value="${netbeans.home}"/> </target> - <target name="-init-caps" if="no.netbeans.home"> + <target name="-init-esb-cmdline" unless="netbeans.home"> <property file="${basedir}/nbproject/private/private.properties"/> - <property name="netbeans.home" value="${caps.netbeans.home}/platform9"/> - <property name="netbeans.user" value="${caps.netbeans.user}"/> + <property name="esb.netbeans.platform" value="${esb.netbeans.home}/platform9"/> + <property name="netbeans.user" value="${esb.netbeans.user}"/> <property name="from.commandline" value="true"/> </target> - <target name="-pre-init" depends="-check-netbeans-home,-init-caps"/> + <target name="-pre-init" depends="-init-esb-ide,-init-esb-cmdline"/> </project> Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml 2009-05-29 13:22:48 UTC (rev 227) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml 2009-05-29 14:45:37 UTC (rev 228) @@ -48,42 +48,42 @@ </target> <target name="-init-taskdefs" if="from.commandline"> <path id="ant.task.classpath"> - <pathelement location="${netbeans.home}/../ide10/modules/ext/resolver-1.2.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-apache-xml-resolver.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-project-ant.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-project-libraries.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-projectapi.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-projectuiapi.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-catalog.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-xam.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-schema-model.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-wsdl-model.jar"/> - <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-retriever.jar"/> - <pathelement location="${netbeans.home}/../platform9/core/core.jar"/> - <pathelement location="${netbeans.home}/../platform9/core/org-openide-filesystems.jar"/> - <pathelement location="${netbeans.home}/../platform9/lib/boot.jar"/> - <pathelement location="${netbeans.home}/../platform9/lib/org-openide-modules.jar"/> - <pathelement location="${netbeans.home}/../platform9/lib/org-openide-util.jar"/> - <pathelement location="${netbeans.home}/../platform9/modules/org-openide-dialogs.jar"/> - <pathelement location="${netbeans.home}/../platform9/modules/org-openide-loaders.jar"/> - <pathelement location="${netbeans.home}/../platform9/modules/org-openide-nodes.jar"/> - <pathelement location="${netbeans.home}/../platform9/modules/org-openide-text.jar"/> - <pathelement location="${netbeans.home}/../platform9/modules/org-netbeans-modules-masterfs.jar"/> - <pathelement location="${netbeans.home}/../platform9/modules/org-netbeans-modules-queries.jar"/> - <pathelement location="${netbeans.home}/../soa2/ant/nblib/org-netbeans-modules-bpel-project.jar"/> - <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-debugger-api.jar"/> - <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-model.jar"/> - <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-project.jar"/> - <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-validation.jar"/> - <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-soa-ui.jar"/> - <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-soa-validation.jar"/> - <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-compapp-projects-base.jar"/> - <pathelement location="${netbeans.home}/../xml2/modules/ext/jxpath/jxpath1.1.jar"/> - <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-catalogsupport.jar"/> - <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-search.jar"/> - <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-wsdl-extensions.jar"/> - <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-xpath.jar"/> - <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-xpath-ext.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/ext/resolver-1.2.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-apache-xml-resolver.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-project-ant.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-project-libraries.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-projectapi.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-projectuiapi.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-xml-catalog.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-xml-xam.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-xml-schema-model.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-xml-wsdl-model.jar"/> + <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-netbeans-modules-xml-retriever.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/core/core.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/core/org-openide-filesystems.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/lib/boot.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/lib/org-openide-modules.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/lib/org-openide-util.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/modules/org-openide-dialogs.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/modules/org-openide-loaders.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/modules/org-openide-nodes.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/modules/org-openide-text.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/modules/org-netbeans-modules-masterfs.jar"/> + <pathelement location="${esb.netbeans.platform}/../platform9/modules/org-netbeans-modules-queries.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/ant/nblib/org-netbeans-modules-bpel-project.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/modules/org-netbeans-modules-bpel-debugger-api.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/modules/org-netbeans-modules-bpel-model.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/modules/org-netbeans-modules-bpel-project.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/modules/org-netbeans-modules-bpel-validation.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/modules/org-netbeans-modules-soa-ui.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/modules/org-netbeans-modules-soa-validation.jar"/> + <pathelement location="${esb.netbeans.platform}/../soa2/modules/org-netbeans-modules-compapp-projects-base.jar"/> + <pathelement location="${esb.netbeans.platform}/../xml2/modules/ext/jxpath/jxpath1.1.jar"/> + <pathelement location="${esb.netbeans.platform}/../xml2/modules/org-netbeans-modules-xml-catalogsupport.jar"/> + <pathelement location="${esb.netbeans.platform}/../xml2/modules/org-netbeans-modules-xml-search.jar"/> + <pathelement location="${esb.netbeans.platform}/../xml2/modules/org-netbeans-modules-xml-wsdl-extensions.jar"/> + <pathelement location="${esb.netbeans.platform}/../xml2/modules/org-netbeans-modules-xml-xpath.jar"/> + <pathelement location="${esb.netbeans.platform}/../xml2/modules/org-netbeans-modules-xml-xpath-ext.jar"/> </path> <taskdef name="validate-project" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliValidateBpelProjectTask"> <classpath refid="ant.task.classpath"/> Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties 2009-05-29 13:22:48 UTC (rev 227) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties 2009-05-29 14:45:37 UTC (rev 228) @@ -1,8 +1,8 @@ build.xml.data.CRC32=6c6f774a -build.xml.script.CRC32=3d3dbc12 -build.xml.stylesheet.CRC32=1947459d +build.xml.script.CRC32=60b50638 +build.xml.stylesheet.CRC32=f35fd70d # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=6c6f774a -nbproject/build-impl.xml.script.CRC32=97378c31 -nbproject/build-impl.xml.stylesheet.CRC32=749ec361 +nbproject/build-impl.xml.script.CRC32=0b0fd8f1 +nbproject/build-impl.xml.stylesheet.CRC32=5068533b Copied: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.bpel (from rev 200, trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel) =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.bpel 2009-05-29 14:45:37 UTC (rev 228) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="InboundObjectProcessor" + targetNamespace="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:tns="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess"> + + <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" location="InboundObjectProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" location="IdentityMapper/wsdl/IdentityMapperWS/IdentityMapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="IdentityMapper" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" partnerLinkType="tns:IdentityMapper" partnerRole="IdentityMapperPortTypeRole"/> + <partnerLink name="ClientAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" partnerLinkType="tns:ObjectProcessor" myRole="ObjectProcessorPortTypeRole"/> + </partnerLinks> + <variables> + <variable name="ProcessCategoryOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" messageType="tns:ProcessCategoryOperationRequest"/> + <variable name="ProcessCourseOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" messageType="tns:ProcessCourseOperationRequest"/> + <variable name="ToBusIdOperationOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" messageType="tns:ToBusIdOperationResponse"/> + <variable name="ToBusIdOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" messageType="tns:ToBusIdOperationRequest"/> + </variables> + <sequence> + <pick name="receiveObject" createInstance="yes"> + + <onMessage partnerLink="ClientAdapter" + operation="ProcessCourseOperation" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" + portType="tns:ObjectProcessorPortType" + variable="ProcessCourseOperationIn"> + <sequence> + <assign name="prepareResolveBusIdForCourse"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <ns0:from>concat('*** Message: ', $ProcessCourseOperationIn)</ns0:from> + </sxt:log> + </sxt:trace> + <copy> + <from variable="ProcessCourseOperationIn" part="clientInstanceId"/> + <to variable="ToBusIdOperationIn" part="clientInstanceId"/> + </copy> + <copy> + <from variable="ProcessCourseOperationIn" part="clientObjectId"/> + <to variable="ToBusIdOperationIn" part="clientObjectId"/> + </copy> + </assign> + </sequence> + </onMessage> + + <onMessage partnerLink="ClientAdapter" + operation="ProcessCategoryOperation" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" + portType="tns:ObjectProcessorPortType" + variable="ProcessCategoryOperationIn"> + <sequence> + <assign name="prepareResolveBusIdForCategory"> + <copy> + <from variable="ProcessCategoryOperationIn" part="clientInstanceId"/> + <to variable="ToBusIdOperationIn" part="clientInstanceId"/> + </copy> + <copy> + <from variable="ProcessCategoryOperationIn" part="clientObjectId"/> + <to variable="ToBusIdOperationIn" part="clientObjectId"/> + </copy> + </assign> + </sequence> + </onMessage> + </pick> + + <invoke name="resolveBusId" partnerLink="IdentityMapper" operation="ToBusIdOperation" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" portType="tns:IdentityMapperPortType" inputVariable="ToBusIdOperationIn" outputVariable="ToBusIdOperationOut"> + <sxt:trace> + <sxt:log level="fine" location="onComplete"> + <from>concat('Resolved busId: ', $ToBusIdOperationOut.busId)</from> + </sxt:log> + </sxt:trace> + </invoke> + <empty name="updateCDMM"/> + </sequence> +</process> Copied: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.wsdl (from rev 200, trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl) =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/InboundObjectProcessor.wsdl 2009-05-29 14:45:37 UTC (rev 228) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="ObjectProcessor" targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" + xmlns:dt="http://cse.campussource.de/schema/DataTypes" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types> + <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor"> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> + </xsd:schema> + </types> + <message name="ProcessCourseOperationRequest"> + <part name="clientInstanceId" type="xsd:long"/> + <part name="clientObjectId" type="xsd:string"/> + <part name="courseMessage" type="dt:courseMessageType"/> + </message> + <message name="ProcessCategoryOperationRequest"> + <part name="clientInstanceId" type="xsd:long"/> + <part name="clientObjectId" type="xsd:string"/> + <part name="categoryMessage" type="dt:categoryMessageType"/> + </message> + <portType name="ObjectProcessorPortType"> + <operation name="ProcessCourseOperation"> + <input name="input1" message="tns:ProcessCourseOperationRequest"/> + </operation> + <operation name="ProcessCategoryOperation"> + <input name="input2" message="tns:ProcessCategoryOperationRequest"/> + </operation> + </portType> + <binding name="ObjectProcessorPortTypeBinding" type="tns:ObjectProcessorPortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="ProcessCourseOperation"> + <soap:operation/> + <input name="input1"> + <soap:body use="literal"/> + </input> + </operation> + <operation name="ProcessCategoryOperation"> + <soap:operation/> + <input name="input2"> + <soap:body use="literal"/> + </input> + </operation> + </binding> + <service name="ObjectProcessorService"> + <port name="ObjectProcessorPortTypeBindingPort" binding="tns:ObjectProcessorPortTypeBinding"> + <soap:address location="http://localhost:${HttpDefaultPort}/service"/> + </port> + </service> + <plnk:partnerLinkType name="ObjectProcessor"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="ObjectProcessorPortTypeRole" portType="tns:ObjectProcessorPortType"/> + </plnk:partnerLinkType> +</definitions> Deleted: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel 2009-05-29 13:22:48 UTC (rev 227) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel 2009-05-29 14:45:37 UTC (rev 228) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<process - name="ObjectProcessor" - targetNamespace="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" - xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" - xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" - xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" - xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" - xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" - xmlns:tns="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess"> - - <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" location="ObjectProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" location="IdentityMapper/wsdl/IdentityMapperWS/IdentityMapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <partnerLinks> - <partnerLink name="IdentityMapper" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" partnerLinkType="tns:IdentityMapper" partnerRole="IdentityMapperPortTypeRole"/> - <partnerLink name="ClientAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" partnerLinkType="tns:ObjectProcessor" myRole="ObjectProcessorPortTypeRole"/> - </partnerLinks> - <variables> - <variable name="ProcessCategoryOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" messageType="tns:ProcessCategoryOperationRequest"/> - <variable name="ProcessCourseOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" messageType="tns:ProcessCourseOperationRequest"/> - <variable name="ToBusIdOperationOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" messageType="tns:ToBusIdOperationResponse"/> - <variable name="ToBusIdOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" messageType="tns:ToBusIdOperationRequest"/> - </variables> - <sequence> - <pick name="receiveObject" createInstance="yes"> - - <onMessage partnerLink="ClientAdapter" - operation="ProcessCourseOperation" - xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" - portType="tns:ObjectProcessorPortType" - variable="ProcessCourseOperationIn"> - <sequence> - <assign name="prepareResolveBusIdForCourse"> - <sxt:trace> - <sxt:log level="info" location="onStart"> - <ns0:from>concat('*** Message: ', $ProcessCourseOperationIn)</ns0:from> - </sxt:log> - </sxt:trace> - <copy> - <from variable="ProcessCourseOperationIn" part="clientInstanceId"/> - <to variable="ToBusIdOperationIn" part="clientInstanceId"/> - </copy> - <copy> - <from variable="ProcessCourseOperationIn" part="clientObjectId"/> - <to variable="ToBusIdOperationIn" part="clientObjectId"/> - </copy> - </assign> - </sequence> - </onMessage> - - <onMessage partnerLink="ClientAdapter" - operation="ProcessCategoryOperation" - xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" - portType="tns:ObjectProcessorPortType" - variable="ProcessCategoryOperationIn"> - <sequence> - <assign name="prepareResolveBusIdForCategory"> - <copy> - <from variable="ProcessCategoryOperationIn" part="clientInstanceId"/> - <to variable="ToBusIdOperationIn" part="clientInstanceId"/> - </copy> - <copy> - <from variable="ProcessCategoryOperationIn" part="clientObjectId"/> - <to variable="ToBusIdOperationIn" part="clientObjectId"/> - </copy> - </assign> - </sequence> - </onMessage> - </pick> - - <invoke name="resolveBusId" partnerLink="IdentityMapper" operation="ToBusIdOperation" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" portType="tns:IdentityMapperPortType" inputVariable="ToBusIdOperationIn" outputVariable="ToBusIdOperationOut"> - <sxt:trace> - <sxt:log level="fine" location="onComplete"> - <from>concat('Resolved busId: ', $ToBusIdOperationOut.busId)</from> - </sxt:log> - </sxt:trace> - </invoke> - <empty name="updateCDMM"/> - </sequence> -</process> Deleted: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl 2009-05-29 13:22:48 UTC (rev 227) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl 2009-05-29 14:45:37 UTC (rev 228) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name="ObjectProcessor" targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" - xmlns:dt="http://cse.campussource.de/schema/DataTypes" - xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <types> - <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor"> - <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> - </xsd:schema> - </types> - <message name="ProcessCourseOperationRequest"> - <part name="clientInstanceId" type="xsd:long"/> - <part name="clientObjectId" type="xsd:string"/> - <part name="courseMessage" type="dt:courseMessageType"/> - </message> - <message name="ProcessCategoryOperationRequest"> - <part name="clientInstanceId" type="xsd:long"/> - <part name="clientObjectId" type="xsd:string"/> - <part name="categoryMessage" type="dt:categoryMessageType"/> - </message> - <portType name="ObjectProcessorPortType"> - <operation name="ProcessCourseOperation"> - <input name="input1" message="tns:ProcessCourseOperationRequest"/> - </operation> - <operation name="ProcessCategoryOperation"> - <input name="input2" message="tns:ProcessCategoryOperationRequest"/> - </operation> - </portType> - <binding name="ObjectProcessorPortTypeBinding" type="tns:ObjectProcessorPortType"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="ProcessCourseOperation"> - <soap:operation/> - <input name="input1"> - <soap:body use="literal"/> - </input> - </operation> - <operation name="ProcessCategoryOperation"> - <soap:operation/> - <input name="input2"> - <soap:body use="literal"/> - </input> - </operation> - </binding> - <service name="ObjectProcessorService"> - <port name="ObjectProcessorPortTypeBindingPort" binding="tns:ObjectProcessorPortTypeBinding"> - <soap:address location="http://localhost:${HttpDefaultPort}/service"/> - </port> - </service> - <plnk:partnerLinkType name="ObjectProcessor"> - <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. -In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. -A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> - <plnk:role name="ObjectProcessorPortTypeRole" portType="tns:ObjectProcessorPortType"/> - </plnk:partnerLinkType> -</definitions> Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/OutboundObjectProcessor.bpel 2009-05-29 14:45:37 UTC (rev 228) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="OutboundObjectProcessor" + targetNamespace="http://enterprise.netbeans.org/bpel/ObjectProcessor/OutboundObjectProcessor" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:tns="http://enterprise.netbeans.org/bpel/ObjectProcessor/OutboundObjectProcessor"> + + <sequence> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.bpel 2009-05-29 14:45:37 UTC (rev 228) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="ReplyProcessor" + targetNamespace="http://enterprise.netbeans.org/bpel/ObjectProcessor/ReplyProcessor" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:tns="http://enterprise.netbeans.org/bpel/ObjectProcessor/ReplyProcessor"> + + <sequence> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ReplyProcessor.wsdl 2009-05-29 14:45:37 UTC (rev 228) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="ReplyProcessor" targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor" xmlns:ns="http://cse.campussource.de/schema/DataTypes" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + <types> + <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ReplyProcessor"> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> + </xsd:schema> + </types> + <message name="processReplyRequest"> + <part name="reply" type="ns:eventReplyMessageType"/> + </message> + <portType name="ReplyProcessorPortType"> + <operation name="processReply"> + <input name="input1" message="tns:processReplyRequest"/> + </operation> + </portType> + <plnk:partnerLinkType name="ReplyProcessor"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="ReplyProcessorPortTypeRole" portType="tns:ReplyProcessorPortType"/> + </plnk:partnerLinkType> +</definitions> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-05-29 13:22:50
|
Revision: 227 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=227&view=rev Author: alexloewen Date: 2009-05-29 13:22:48 +0000 (Fri, 29 May 2009) Log Message: ----------- added deleteObjectNS.xsl , it makes object_xml acceptable by ILIAS. Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/deleteObjectsNS.xsl Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel 2009-05-29 12:43:01 UTC (rev 226) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel 2009-05-29 13:22:48 UTC (rev 227) @@ -39,7 +39,7 @@ <to variable="GetObjectsByTitleIn" part="sid"/> </copy> <copy> - <from>'test7'</from> + <from>'test10'</from> <to variable="GetObjectsByTitleIn" part="title"/> </copy> <copy> @@ -59,6 +59,11 @@ </assign> <assign name="doXSLTransformation"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <ns0:from>concat('*** before xslt: ', $GetObjectsByTitleOut.object_xml)</ns0:from> + </sxt:log> + </sxt:trace> <copy> <from>ns0:doXslTransform('urn:stylesheets:setObjectsNS.xsl', $CategoryXML)</from> <to variable="CategoryXMLtransformed"/> @@ -67,11 +72,11 @@ </assign> <assign name="fakeUpdateData"> <copy> - <from>'test10'</from> + <from>'test12'</from> <to>$CategoryXMLtransformed/il_objs:Object/il_objs:Title</to> </copy> <copy> - <from>'descrTest'</from> + <from>'descrTest2'</from> <to>$CategoryXMLtransformed/il_objs:Object/il_objs:Description</to> </copy> <copy> @@ -79,16 +84,22 @@ <to>$CategoryXMLtransformed/il_objs:Object/il_objs:LastUpdate</to> </copy> </assign> + <assign name="deleteNamespaces"> + <copy> + <from>ns0:doXslTransform('urn:stylesheets:deleteObjectsNS.xsl', $CategoryXMLtransformed)</from> + <to variable="CategoryXML"/> + </copy> + </assign> <assign name="marshallCategoryXML"> <copy> - <from>sxxf:doMarshal($CategoryXMLtransformed)</from> + <from>sxxf:doMarshal($CategoryXML)</from> <to variable="UpdateObjectsIn" part="object_xml"/> </copy> </assign> <assign name="prepareForUpdateObject"> <sxt:trace> <sxt:log level="info" location="onStart"> - <ns0:from>concat('*** Objects-XML: ', $UpdateObjectsIn.object_xml)</ns0:from> + <ns0:from>concat('*** InputForUpdate: ', $UpdateObjectsIn.object_xml)</ns0:from> </sxt:log> </sxt:trace> <copy> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/deleteObjectsNS.xsl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/deleteObjectsNS.xsl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/deleteObjectsNS.xsl 2009-05-29 13:22:48 UTC (rev 227) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Document : deleteObjectsNS.xsl.xsl + Created on : May 29, 2009, 15:00 PM + Author : alex + Description: + delete Namespaces, because ilias doesnt like it +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:il_objects="http://cse.campussource.de/schema/ilias/objects" + xmlns="http://cse.campussource.de/schema/ilias/objects" + version="1.0"> + + <xsl:output method="xml" + media-type="text/xml" + indent="yes" + encoding="UTF-8" + omit-xml-declaration="no"/> + + <xsl:template match="*"> + <xsl:element name="{local-name()}" namespace=""> +<!-- + <xsl:copy-of select="node()"/> +--> + + <xsl:apply-templates select="@*|node()"/> + + </xsl:element> + </xsl:template> + + <xsl:template match="@*"> + <xsl:attribute name="{local-name()}" namespace=""> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:template> + + <xsl:template match="processing-instruction()|comment()"> + <xsl:copy> + <xsl:apply-templates select="node()"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-05-29 12:43:08
|
Revision: 226 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=226&view=rev Author: alexloewen Date: 2009-05-29 12:43:01 +0000 (Fri, 29 May 2009) Log Message: ----------- Some Funktionality to delete/update Category and delete/updateCourse. Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Concurrent.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Input.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Output.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Concurrent.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Input.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Output.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Concurrent.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Input.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Output.xml Modified: trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa 2009-05-29 12:42:50 UTC (rev 225) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa 2009-05-29 12:43:01 UTC (rev 226) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="LSFClientAdapterCA" xmlns:ns10="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCategory" xmlns:ns11="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" xmlns:ns12="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" xmlns:ns13="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:ns14="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCourse" xmlns:ns15="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" xmlns:ns16="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCourse" xmlns:ns17="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" xmlns:ns18="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCategory" xmlns:ns19="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" xmlns:ns2="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" xmlns:ns20="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse" xmlns:ns21="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" xmlns:ns22="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns:ns23="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" xmlns:ns24="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:ns3="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" xmlns:ns4="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:ns5="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns6="urn:ilUserAdministration" xmlns:ns7="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" xmlns:ns8="http://cse.campussource.de/bpel/ILIASClientAdapter/Login" xmlns:ns9="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" xmlns:xlink="http://www.w3.org/2000/xlink"> +<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="LSFClientAdapterCA" xmlns:ns10="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCategory" xmlns:ns11="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" xmlns:ns12="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCourse" xmlns:ns13="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" xmlns:ns14="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCourse" xmlns:ns15="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" xmlns:ns16="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns:ns17="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCategory" xmlns:ns18="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" xmlns:ns19="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" xmlns:ns2="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" xmlns:ns20="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:ns21="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse" xmlns:ns22="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" xmlns:ns23="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" xmlns:ns24="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:ns3="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" xmlns:ns4="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:ns5="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns6="urn:ilUserAdministration" xmlns:ns7="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" xmlns:ns8="http://cse.campussource.de/bpel/ILIASClientAdapter/Login" xmlns:ns9="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" xmlns:xlink="http://www.w3.org/2000/xlink"> <endpoints> <endpoint endpoint-name="casaPort1" interface-name="ns2:LSFClientAdapterPortType" name="endpoint1" service-name="ns1:casaService1"/> <endpoint endpoint-name="XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint2" service-name="ns3:XSLTTransformService"/> @@ -8,31 +8,35 @@ <endpoint endpoint-name="ILIASSoapWebservicePort" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint5" service-name="ns6:ILIASSoapWebservice"/> <endpoint endpoint-name="ILIASClientAdapterPort" interface-name="ns7:ILIASClientAdapterPortType" name="endpoint6" service-name="ns7:ILIASClientAdapterService"/> <endpoint display-name="IliasAdapter" endpoint-name="LoginPortTypeRole_myRole" file-path="Login.bpel" interface-name="ns9:LoginPortType" name="endpoint7" process-name="Login" service-name="ns8:IliasAdapter"/> - <endpoint display-name="IliasAdpater" endpoint-name="UpdateCategoryPortTypeRole_myRole" file-path="UpdateCategory.bpel" interface-name="ns11:UpdateCategoryPortType" name="endpoint8" process-name="UpdateCategory" service-name="ns10:IliasAdpater"/> - <endpoint display-name="IliasAdapter" endpoint-name="DeleteCategoryPortTypeRole_myRole" file-path="DeleteCategory.bpel" interface-name="ns13:DeleteCategoryPortType" name="endpoint9" process-name="DeleteCategory" service-name="ns12:IliasAdapter"/> - <endpoint display-name="IliasAdapter" endpoint-name="AddCoursePortTypeRole_myRole" file-path="AddCourse.bpel" interface-name="ns15:AddCoursePortType" name="endpoint10" process-name="AddCourse" service-name="ns14:IliasAdapter"/> - <endpoint display-name="IliasAdapter" endpoint-name="UpdateCoursePortTypeRole_myRole" file-path="UpdateCourse.bpel" interface-name="ns17:UpdateCoursePortType" name="endpoint11" process-name="UpdateCourse" service-name="ns16:IliasAdapter"/> - <endpoint display-name="IliasAdapter" endpoint-name="AddCategoryPortTypeRole_myRole" file-path="AddCategory.bpel" interface-name="ns19:AddCategoryPortType" name="endpoint12" process-name="AddCategory" service-name="ns18:IliasAdapter"/> - <endpoint display-name="IliasAdapter" endpoint-name="DeleteCoursePortTypeRole_myRole" file-path="DeleteCourse.bpel" interface-name="ns21:DeleteCoursePortType" name="endpoint13" process-name="DeleteCourse" service-name="ns20:IliasAdapter"/> - <endpoint display-name="ILIASAdapter" endpoint-name="ILIASClientAdapterPortTypeRole_myRole" file-path="OutboundClientAdapter.bpel" interface-name="ns7:ILIASClientAdapterPortType" name="endpoint14" process-name="OutboundClientAdapter" service-name="ns22:ILIASAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="AddCategoryPortTypeRole_myRole" file-path="AddCategory.bpel" interface-name="ns11:AddCategoryPortType" name="endpoint8" process-name="AddCategory" service-name="ns10:IliasAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="AddCoursePortTypeRole_myRole" file-path="AddCourse.bpel" interface-name="ns13:AddCoursePortType" name="endpoint9" process-name="AddCourse" service-name="ns12:IliasAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="UpdateCoursePortTypeRole_myRole" file-path="UpdateCourse.bpel" interface-name="ns15:UpdateCoursePortType" name="endpoint10" process-name="UpdateCourse" service-name="ns14:IliasAdapter"/> + <endpoint display-name="ILIASAdapter" endpoint-name="ILIASClientAdapterPortTypeRole_myRole" file-path="OutboundClientAdapter.bpel" interface-name="ns7:ILIASClientAdapterPortType" name="endpoint11" process-name="OutboundClientAdapter" service-name="ns16:ILIASAdapter"/> + <endpoint display-name="IliasAdpater" endpoint-name="UpdateCategoryPortTypeRole_myRole" file-path="UpdateCategory.bpel" interface-name="ns18:UpdateCategoryPortType" name="endpoint12" process-name="UpdateCategory" service-name="ns17:IliasAdpater"/> + <endpoint display-name="IliasAdapter" endpoint-name="DeleteCategoryPortTypeRole_myRole" file-path="DeleteCategory.bpel" interface-name="ns20:DeleteCategoryPortType" name="endpoint13" process-name="DeleteCategory" service-name="ns19:IliasAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="DeleteCoursePortTypeRole_myRole" file-path="DeleteCourse.bpel" interface-name="ns22:DeleteCoursePortType" name="endpoint14" process-name="DeleteCourse" service-name="ns21:IliasAdapter"/> <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="Login.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint15" process-name="Login" service-name="ns8:ILIAS"/> - <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="AddCourse.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint16" process-name="AddCourse" service-name="ns14:ILIAS"/> - <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="AddCategory.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint17" process-name="AddCategory" service-name="ns18:ILIAS"/> - <endpoint display-name="Login" endpoint-name="LoginPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns9:LoginPortType" name="endpoint18" process-name="OutboundClientAdapter" service-name="ns22:Login"/> - <endpoint display-name="AddCourse" endpoint-name="AddCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns15:AddCoursePortType" name="endpoint19" process-name="OutboundClientAdapter" service-name="ns22:AddCourse"/> - <endpoint display-name="UpdateCourse" endpoint-name="UpdateCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns17:UpdateCoursePortType" name="endpoint20" process-name="OutboundClientAdapter" service-name="ns22:UpdateCourse"/> - <endpoint display-name="DeleteCourse" endpoint-name="DeleteCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns21:DeleteCoursePortType" name="endpoint21" process-name="OutboundClientAdapter" service-name="ns22:DeleteCourse"/> - <endpoint display-name="AddCategory" endpoint-name="AddCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns19:AddCategoryPortType" name="endpoint22" process-name="OutboundClientAdapter" service-name="ns22:AddCategory"/> - <endpoint display-name="UpdateCategory" endpoint-name="UpdateCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns11:UpdateCategoryPortType" name="endpoint23" process-name="OutboundClientAdapter" service-name="ns22:UpdateCategory"/> - <endpoint display-name="DeleteCategory" endpoint-name="DeleteCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns13:DeleteCategoryPortType" name="endpoint24" process-name="OutboundClientAdapter" service-name="ns22:DeleteCategory"/> - <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint25" process-name="OutboundClientAdapter" service-name="ns22:ILIAS"/> - <endpoint display-name="ClientAdapter" endpoint-name="ObjectProcessorPortTypeRole_myRole" file-path="ObjectProcessor.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint26" process-name="ObjectProcessor" service-name="ns23:ClientAdapter"/> - <endpoint display-name="IdentityMapper" endpoint-name="IdentityMapperPortTypeRole_partnerRole" file-path="ObjectProcessor.bpel" interface-name="ns4:IdentityMapperPortType" name="endpoint27" process-name="ObjectProcessor" service-name="ns23:IdentityMapper"/> - <endpoint endpoint-name="javaee_IdentityMapperPort" interface-name="ns4:IdentityMapperPortType" name="endpoint28" service-name="ns4:IdentityMapperService"/> - <endpoint endpoint-name="javaee_XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint29" service-name="ns3:XSLTTransformService"/> - <endpoint display-name="LSF" endpoint-name="LSFClientAdapterPortTypeRole_myRole" file-path="InboundClientAdapter.bpel" interface-name="ns2:LSFClientAdapterPortType" name="endpoint30" process-name="InboundClientAdapter" service-name="ns24:LSF"/> - <endpoint display-name="XSLTTransform" endpoint-name="XSLTTransformPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns3:XSLTTransformPortType" name="endpoint31" process-name="InboundClientAdapter" service-name="ns24:XSLTTransform"/> - <endpoint display-name="ObjectProcessor" endpoint-name="ObjectProcessorPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint32" process-name="InboundClientAdapter" service-name="ns24:ObjectProcessor"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="AddCategory.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint16" process-name="AddCategory" service-name="ns10:ILIAS"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="AddCourse.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint17" process-name="AddCourse" service-name="ns12:ILIAS"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="UpdateCourse.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint18" process-name="UpdateCourse" service-name="ns14:ILIAS"/> + <endpoint display-name="Login" endpoint-name="LoginPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns9:LoginPortType" name="endpoint19" process-name="OutboundClientAdapter" service-name="ns16:Login"/> + <endpoint display-name="AddCourse" endpoint-name="AddCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns13:AddCoursePortType" name="endpoint20" process-name="OutboundClientAdapter" service-name="ns16:AddCourse"/> + <endpoint display-name="UpdateCourse" endpoint-name="UpdateCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns15:UpdateCoursePortType" name="endpoint21" process-name="OutboundClientAdapter" service-name="ns16:UpdateCourse"/> + <endpoint display-name="DeleteCourse" endpoint-name="DeleteCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns22:DeleteCoursePortType" name="endpoint22" process-name="OutboundClientAdapter" service-name="ns16:DeleteCourse"/> + <endpoint display-name="AddCategory" endpoint-name="AddCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns11:AddCategoryPortType" name="endpoint23" process-name="OutboundClientAdapter" service-name="ns16:AddCategory"/> + <endpoint display-name="UpdateCategory" endpoint-name="UpdateCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns18:UpdateCategoryPortType" name="endpoint24" process-name="OutboundClientAdapter" service-name="ns16:UpdateCategory"/> + <endpoint display-name="DeleteCategory" endpoint-name="DeleteCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns20:DeleteCategoryPortType" name="endpoint25" process-name="OutboundClientAdapter" service-name="ns16:DeleteCategory"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint26" process-name="OutboundClientAdapter" service-name="ns16:ILIAS"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="UpdateCategory.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint27" process-name="UpdateCategory" service-name="ns17:ILIAS"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="DeleteCategory.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint28" process-name="DeleteCategory" service-name="ns19:ILIAS"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="DeleteCourse.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint29" process-name="DeleteCourse" service-name="ns21:ILIAS"/> + <endpoint display-name="ClientAdapter" endpoint-name="ObjectProcessorPortTypeRole_myRole" file-path="ObjectProcessor.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint30" process-name="ObjectProcessor" service-name="ns23:ClientAdapter"/> + <endpoint display-name="IdentityMapper" endpoint-name="IdentityMapperPortTypeRole_partnerRole" file-path="ObjectProcessor.bpel" interface-name="ns4:IdentityMapperPortType" name="endpoint31" process-name="ObjectProcessor" service-name="ns23:IdentityMapper"/> + <endpoint endpoint-name="javaee_IdentityMapperPort" interface-name="ns4:IdentityMapperPortType" name="endpoint32" service-name="ns4:IdentityMapperService"/> + <endpoint endpoint-name="javaee_XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint33" service-name="ns3:XSLTTransformService"/> + <endpoint display-name="LSF" endpoint-name="LSFClientAdapterPortTypeRole_myRole" file-path="InboundClientAdapter.bpel" interface-name="ns2:LSFClientAdapterPortType" name="endpoint34" process-name="InboundClientAdapter" service-name="ns24:LSF"/> + <endpoint display-name="XSLTTransform" endpoint-name="XSLTTransformPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns3:XSLTTransformPortType" name="endpoint35" process-name="InboundClientAdapter" service-name="ns24:XSLTTransform"/> + <endpoint display-name="ObjectProcessor" endpoint-name="ObjectProcessorPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint36" process-name="InboundClientAdapter" service-name="ns24:ObjectProcessor"/> </endpoints> <service-units> <service-engine-service-unit artifacts-zip="ILIASClientAdapter.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-ILIASClientAdapter" unit-name="ILIASClientAdapter" unknown="false" x="593" y="37"> @@ -55,22 +59,26 @@ <consumes endpoint="endpoint23"/> <consumes endpoint="endpoint24"/> <consumes endpoint="endpoint25"/> + <consumes endpoint="endpoint26"/> + <consumes endpoint="endpoint27"/> + <consumes endpoint="endpoint28"/> + <consumes endpoint="endpoint29"/> </service-engine-service-unit> <service-engine-service-unit artifacts-zip="Common.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-Common" unit-name="Common" unknown="false" x="690" y="803"/> <service-engine-service-unit artifacts-zip="ObjectProcessor.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-ObjectProcessor" unit-name="ObjectProcessor" unknown="false" x="154" y="599"> - <provides endpoint="endpoint26"/> - <consumes endpoint="endpoint27"/> + <provides endpoint="endpoint30"/> + <consumes endpoint="endpoint31"/> </service-engine-service-unit> <service-engine-service-unit artifacts-zip="IdentityMapper.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-IdentityMapper" unit-name="IdentityMapper" unknown="false" x="374" y="789"> - <provides endpoint="endpoint28"/> + <provides endpoint="endpoint32"/> </service-engine-service-unit> <service-engine-service-unit artifacts-zip="XSLTTransform.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-XSLTTransform" unit-name="XSLTTransform" unknown="false" x="346" y="429"> - <provides endpoint="endpoint29"/> + <provides endpoint="endpoint33"/> </service-engine-service-unit> <service-engine-service-unit artifacts-zip="LSFClientAdapter.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-LSFClientAdapter" unit-name="LSFClientAdapter" unknown="false" x="54" y="385"> - <provides endpoint="endpoint30"/> - <consumes endpoint="endpoint31"/> - <consumes endpoint="endpoint32"/> + <provides endpoint="endpoint34"/> + <consumes endpoint="endpoint35"/> + <consumes endpoint="endpoint36"/> </service-engine-service-unit> <binding-component-service-unit artifacts-zip="sun-http-binding.jar" component-name="sun-http-binding" description="Represents this Service Unit" name="CSEIPCA-sun-http-binding" unit-name="sun-http-binding"> <ports> @@ -79,8 +87,8 @@ <consumes endpoint="endpoint1"/> <provides endpoint="endpoint1"/> </port> - <port state="deleted" x="67" y="37"> - <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService']/port[@name='XSLTTransformPort'])" xlink:type="simple"/> + <port state="deleted" x="0" y="-1"> + <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService']/port[@name='XSLTTransformPort'])" xlink:type="simple"/> <consumes endpoint="endpoint2"/> <provides endpoint="endpoint2"/> </port> @@ -108,83 +116,87 @@ </binding-component-service-unit> </service-units> <connections> - <connection consumer="endpoint18" provider="endpoint7" state="unchanged"/> <connection consumer="endpoint15" provider="endpoint5" state="unchanged"/> <connection consumer="endpoint16" provider="endpoint5" state="unchanged"/> <connection consumer="endpoint17" provider="endpoint5" state="unchanged"/> - <connection consumer="endpoint25" provider="endpoint5" state="unchanged"/> - <connection consumer="endpoint20" provider="endpoint11" state="unchanged"/> - <connection consumer="endpoint27" provider="endpoint28" state="unchanged"/> - <connection consumer="endpoint31" provider="endpoint29" state="unchanged"/> - <connection consumer="endpoint1" provider="endpoint30" state="new"/> - <connection consumer="endpoint19" provider="endpoint10" state="unchanged"/> - <connection consumer="endpoint4" provider="endpoint26" state="unchanged"/> - <connection consumer="endpoint32" provider="endpoint26" state="unchanged"/> - <connection consumer="endpoint21" provider="endpoint13" state="unchanged"/> - <connection consumer="endpoint24" provider="endpoint9" state="unchanged"/> - <connection consumer="endpoint6" provider="endpoint14" state="unchanged"/> + <connection consumer="endpoint18" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint26" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint27" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint28" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint29" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint19" provider="endpoint7" state="unchanged"/> + <connection consumer="endpoint31" provider="endpoint32" state="unchanged"/> + <connection consumer="endpoint21" provider="endpoint10" state="unchanged"/> + <connection consumer="endpoint35" provider="endpoint33" state="unchanged"/> + <connection consumer="endpoint1" provider="endpoint34" state="new"/> + <connection consumer="endpoint20" provider="endpoint9" state="unchanged"/> + <connection consumer="endpoint4" provider="endpoint30" state="unchanged"/> + <connection consumer="endpoint36" provider="endpoint30" state="unchanged"/> + <connection consumer="endpoint22" provider="endpoint14" state="unchanged"/> + <connection consumer="endpoint25" provider="endpoint13" state="unchanged"/> + <connection consumer="endpoint6" provider="endpoint11" state="unchanged"/> + <connection consumer="endpoint24" provider="endpoint12" state="unchanged"/> <connection consumer="endpoint23" provider="endpoint8" state="unchanged"/> - <connection consumer="endpoint22" provider="endpoint12" state="unchanged"/> - <connection consumer="endpoint2" provider="endpoint29" state="deleted"/> - <connection consumer="endpoint3" provider="endpoint28" state="deleted"/> + <connection consumer="endpoint2" provider="endpoint33" state="deleted"/> + <connection consumer="endpoint3" provider="endpoint32" state="deleted"/> </connections> <porttypes> <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/portType[@name='dummyCasaPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/Common/CDMM.wsdl#xpointer(/definitions/portType[@name='CDMMPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/LSFClientAdapter/LSFClientAdapter.wsdl#xpointer(/definitions/portType[@name='LSFClientAdapterPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/portType[@name='XSLTTransformPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/portType[@name='XSLTTransformPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ObjectProcessor/ObjectProcessor.wsdl#xpointer(/definitions/portType[@name='ObjectProcessorPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/portType[@name='XSLTTransformPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/Common/src/CDMM.wsdl#xpointer(/definitions/portType[@name='CDMMPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/LSFClientAdapter/src/_references/_projects/ObjectProcessor/src/ObjectProcessor.wsdl#xpointer(/definitions/portType[@name='ObjectProcessorPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/ILIASClientAdapter/src/ilias-3.10.5.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/CSEIPCA.wsdl#xpointer(/definitions/portType[@name='dummyCasaPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/Common/CDMM.wsdl#xpointer(/definitions/portType[@name='CDMMPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/portType[@name='XSLTTransformPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/LSFClientAdapter.wsdl#xpointer(/definitions/portType[@name='LSFClientAdapterPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/UpdateCourse.wsdl#xpointer(/definitions/portType[@name='UpdateCoursePortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/Login.wsdl#xpointer(/definitions/portType[@name='LoginPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/AddCourse.wsdl#xpointer(/definitions/portType[@name='AddCoursePortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/AddCategory.wsdl#xpointer(/definitions/portType[@name='AddCategoryPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ILIASClientAdapter.wsdl#xpointer(/definitions/portType[@name='ILIASClientAdapterPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/DeleteCategory.wsdl#xpointer(/definitions/portType[@name='DeleteCategoryPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5-fixed.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/DeleteCourse.wsdl#xpointer(/definitions/portType[@name='DeleteCoursePortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/UpdateCategory.wsdl#xpointer(/definitions/portType[@name='UpdateCategoryPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5-fixed.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/AddCourse.wsdl#xpointer(/definitions/portType[@name='AddCoursePortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/Login.wsdl#xpointer(/definitions/portType[@name='LoginPortType'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/UpdateCourse.wsdl#xpointer(/definitions/portType[@name='UpdateCoursePortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/DeleteCategory.wsdl#xpointer(/definitions/portType[@name='DeleteCategoryPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/META-INF/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> </porttypes> <bindings> <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/binding[@name='casaBinding1'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/Common/CDMM.wsdl#xpointer(/definitions/binding[@name='CDMMPortTypeBinding'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/LSFClientAdapter/LSFClientAdapter.wsdl#xpointer(/definitions/binding[@name='LSFClientAdapterPortTypeBinding'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/binding[@name='XSLTTransformBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/binding[@name='XSLTTransformBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ObjectProcessor/ObjectProcessor.wsdl#xpointer(/definitions/binding[@name='ObjectProcessorPortTypeBinding'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/binding[@name='XSLTTransformBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/binding[@name='IdentityMapperBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/Common/src/CDMM.wsdl#xpointer(/definitions/binding[@name='CDMMPortTypeBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/LSFClientAdapter/src/_references/_projects/ObjectProcessor/src/ObjectProcessor.wsdl#xpointer(/definitions/binding[@name='ObjectProcessorPortTypeBinding'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/binding[@name='IdentityMapperBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/ILIASClientAdapter/src/ilias-3.10.5.wsdl#xpointer(/definitions/binding[@name='ILIASSoapWebserviceBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/CSEIPCA.wsdl#xpointer(/definitions/binding[@name='casaBinding1'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/Common/CDMM.wsdl#xpointer(/definitions/binding[@name='CDMMPortTypeBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/binding[@name='XSLTTransformBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/LSFClientAdapter.wsdl#xpointer(/definitions/binding[@name='LSFClientAdapterPortTypeBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5.wsdl#xpointer(/definitions/binding[@name='ILIASSoapWebserviceBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ILIASClientAdapter.wsdl#xpointer(/definitions/binding[@name='ILIASClientAdapterBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5-fixed.wsdl#xpointer(/definitions/binding[@name='ILIASSoapWebserviceBinding'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5.wsdl#xpointer(/definitions/binding[@name='ILIASSoapWebserviceBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/IdentityMapper.wsdl#xpointer(/definitions/binding[@name='IdentityMapperBinding'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/META-INF/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/binding[@name='IdentityMapperBinding'])" xlink:type="simple"/> </bindings> <services> <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/service[@name='casaService1'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/Common/CDMM.wsdl#xpointer(/definitions/service[@name='CDMMService'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ObjectProcessor/ObjectProcessor.wsdl#xpointer(/definitions/service[@name='ObjectProcessorService'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/Common/src/CDMM.wsdl#xpointer(/definitions/service[@name='CDMMService'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/LSFClientAdapter/src/_references/_projects/ObjectProcessor/src/ObjectProcessor.wsdl#xpointer(/definitions/service[@name='ObjectProcessorService'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/ILIASClientAdapter/src/ilias-3.10.5.wsdl#xpointer(/definitions/service[@name='ILIASSoapWebservice'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/CSEIPCA.wsdl#xpointer(/definitions/service[@name='casaService1'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/Common/CDMM.wsdl#xpointer(/definitions/service[@name='CDMMService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5.wsdl#xpointer(/definitions/service[@name='ILIASSoapWebservice'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ILIASClientAdapter.wsdl#xpointer(/definitions/service[@name='ILIASClientAdapterService'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5-fixed.wsdl#xpointer(/definitions/service[@name='ILIASSoapWebservice'])" xlink:type="simple"/> - <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5.wsdl#xpointer(/definitions/service[@name='ILIASSoapWebservice'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/META-INF/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService'])" xlink:type="simple"/> </services> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Concurrent.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Concurrent.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Concurrent.properties 2009-05-29 12:43:01 UTC (rev 226) @@ -0,0 +1,13 @@ +calculatethroughput=false +#comparisontype's possible values: identical|binary|equals +comparisontype=identical +concurrentthreads=1 +description=testcase iliasAdapter_deleteCategory +destination=http://localhost:${HttpDefaultPort}/ILIASClientAdapterService/ILIASClientAdapterPort +#featurestatus's possible values: progress|done +featurestatus=done +inputfile=Input.xml +invokesperthread=1 +outputfile=Output.xml +soapaction= +testtimeout=30 Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Input.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Input.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCategory/Input.xml 2009-05-29 12:43:01 UTC (rev 226) @@ -0,0 +1,32 @@ +<soapenv:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ili="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"> + <soapenv:Body> + <ili:processCategory> + <categoryMessage> + <category> + <busId>?string?</busId> + <eventTime>?2008-09-29T03:49:45?</eventTime> + <!--Zero or more repetitions:--> + <attribute> + <name>dings</name> + <value>bums</value> + <transient>false</transient> + </attribute> + <!--Optional:--> + <parent>?string?</parent> + <!--Optional:--> + <categories> + <!--Zero or more repetitions:--> + <category>?string?</category> + </categories> + <!--Optional:--> + <courses> + <!--Zero or more repetitions:--> + <course>?string?</course> + </courses> + </category> + <eventTime>?2004-02-14T19:44:14?</eventTime> + <event>DELETE</event> + </categoryMessage> + </ili:processCategory> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Concurrent.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Concurrent.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Concurrent.properties 2009-05-29 12:43:01 UTC (rev 226) @@ -0,0 +1,13 @@ +calculatethroughput=false +#comparisontype's possible values: identical|binary|equals +comparisontype=identical +concurrentthreads=1 +description=testcase iliasAdapter_deleteCourse +destination=http://localhost:${HttpDefaultPort}/ILIASClientAdapterService/ILIASClientAdapterPort +#featurestatus's possible values: progress|done +featurestatus=done +inputfile=Input.xml +invokesperthread=1 +outputfile=Output.xml +soapaction= +testtimeout=30 Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Input.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Input.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_deleteCourse/Input.xml 2009-05-29 12:43:01 UTC (rev 226) @@ -0,0 +1,32 @@ +<soapenv:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ili="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"> + <soapenv:Body> + <ili:processCourse> + <courseMessage> + <course> + <busId>?string?</busId> + <eventTime>?2008-09-29T03:49:45?</eventTime> + <!--Zero or more repetitions:--> + <attribute> + <name>blabla</name> + <value>blub</value> + <transient>false</transient> + </attribute> + <!--Optional:--> + <categories> + <!--Zero or more repetitions:--> + <category>?string?</category> + </categories> + <!--Optional:--> + <parent>?string?</parent> + <!--Optional:--> + <workgroups> + <!--Zero or more repetitions:--> + <workgroup>?string?</workgroup> + </workgroups> + </course> + <eventTime>?2004-02-14T19:44:14?</eventTime> + <event>DELETE</event> + </courseMessage> + </ili:processCourse> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Concurrent.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Concurrent.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Concurrent.properties 2009-05-29 12:43:01 UTC (rev 226) @@ -0,0 +1,13 @@ +calculatethroughput=false +#comparisontype's possible values: identical|binary|equals +comparisontype=identical +concurrentthreads=1 +description=testcase iliasAdapter_updateCategory +destination=http://localhost:${HttpDefaultPort}/ILIASClientAdapterService/ILIASClientAdapterPort +#featurestatus's possible values: progress|done +featurestatus=done +inputfile=Input.xml +invokesperthread=1 +outputfile=Output.xml +soapaction= +testtimeout=30 Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Input.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Input.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/iliasAdapter_updateCategory/Input.xml 2009-05-29 12:43:01 UTC (rev 226) @@ -0,0 +1,32 @@ +<soapenv:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ili="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"> + <soapenv:Body> + <ili:processCategory> + <categoryMessage> + <category> + <busId>?string?</busId> + <eventTime>?2008-09-29T03:49:45?</eventTime> + <!--Zero or more repetitions:--> + <attribute> + <name>blabla</name> + <value>blublu</value> + <transient>false</transient> + </attribute> + <!--Optional:--> + <parent>?string?</parent> + <!--Optional:--> + <categories> + <!--Zero or more repetitions:--> + <category>?string?</category> + </categories> + <!--Optional:--> + <courses> + <!--Zero or more repetitions:--> + <course>?string?</course> + </courses> + </category> + <eventTime>?2004-02-14T19:44:14?</eventTime> + <event>UPDATE</event> + </categoryMessage> + </ili:processCategory> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-05-29 12:43:06
|
Revision: 225 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=225&view=rev Author: alexloewen Date: 2009-05-29 12:42:50 +0000 (Fri, 29 May 2009) Log Message: ----------- Some Funktionality to delete/update Category and delete/updateCourse. Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/catalog.xml trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/catalog.xml 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/catalog.xml 2009-05-29 12:42:50 UTC (rev 225) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <system systemId="file:/home/pete/openESB/ilias-3.10.5.wsdl" uri="src/ilias-3.10.5.wsdl"/> + <system systemId="Common/CDDM.xsd" uri="nb-uri:Common#src/CDDM.xsd"/> <nextCatalog catalog="nbproject/private/cache/retriever/catalog.xml"/> - <system systemId="Common/CDDM.xsd" uri="nb-uri:Common#src/CDDM.xsd"/> </catalog> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel 2009-05-29 12:42:50 UTC (rev 225) @@ -49,7 +49,7 @@ <from> <literal> <Object xmlns="http://cse.campussource.de/schema/ilias/objects" type="cat"> - <Title>category1</Title> + <Title>category2</Title> <Description>test category</Description> </Object> </literal> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel 2009-05-29 12:42:50 UTC (rev 225) @@ -223,7 +223,7 @@ </Course> </literal> </from> - <to>$CourseXML</to> + <to variable="CourseXML"/> </copy> </assign> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel 2009-05-29 12:42:50 UTC (rev 225) @@ -10,15 +10,37 @@ xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory"> <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" partnerLinkType="tns:DeleteCategory" myRole="DeleteCategoryPortTypeRole"/> </partnerLinks> <variables> + <variable name="DeleteObjectOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:deleteObjectResponse"/> + <variable name="DeleteObjectIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:deleteObjectRequest"/> <variable name="DeleteCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryResponse"/> <variable name="DeleteCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest"/> </variables> <sequence> <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="deleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" portType="tns:DeleteCategoryPortType" variable="DeleteCategoryIn"/> + <assign name="prepareForDeleteCategory"> + <copy> + <from variable="DeleteCategoryIn" part="SID"/> + <to variable="DeleteObjectIn" part="sid"/> + </copy> + <copy> + <from>46</from> + <to variable="DeleteObjectIn" part="reference_id"/> + </copy> + </assign> + <invoke name="DeleteCategoryInvoke" partnerLink="ILIAS" operation="deleteObject" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="DeleteObjectIn" outputVariable="DeleteObjectOut"/> + <assign name="PrepareReply"> + <copy> + <from variable="DeleteObjectOut" part="success"/> + <to variable="DeleteCategoryOut" part="success"/> + </copy> + </assign> <reply name="return" partnerLink="IliasAdapter" operation="deleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" portType="tns:DeleteCategoryPortType" variable="DeleteCategoryOut"/> </sequence> </process> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel 2009-05-29 12:42:50 UTC (rev 225) @@ -10,15 +10,37 @@ xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse"> <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" partnerLinkType="tns:DeleteCourse" myRole="DeleteCoursePortTypeRole"/> </partnerLinks> <variables> + <variable name="DeleteCourseOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:deleteCourseResponse"/> + <variable name="DeleteCourseIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:deleteCourseRequest"/> <variable name="DeleteCourseOperationOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseResponse"/> <variable name="DeleteCourseOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseRequest"/> </variables> <sequence> <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="deleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" portType="tns:DeleteCoursePortType" variable="DeleteCourseOperationIn"/> + <assign name="prepareForDeleteCourse"> + <copy> + <from variable="DeleteCourseOperationIn" part="SID"/> + <to variable="DeleteCourseIn" part="sid"/> + </copy> + <copy> + <from>177</from> + <to variable="DeleteCourseIn" part="course_id"/> + </copy> + </assign> + <invoke name="deleteCourseInvoke" partnerLink="ILIAS" operation="deleteCourse" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="DeleteCourseIn" outputVariable="DeleteCourseOut"/> + <assign name="prepareReply"> + <copy> + <from variable="DeleteCourseOut" part="success"/> + <to variable="DeleteCourseOperationOut" part="success"/> + </copy> + </assign> <reply name="reply" partnerLink="IliasAdapter" operation="deleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" portType="tns:DeleteCoursePortType" variable="DeleteCourseOperationOut"/> </sequence> </process> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel 2009-05-29 12:42:50 UTC (rev 225) @@ -43,7 +43,7 @@ <to variable="IliasLoginIn" part="username"/> </copy> <copy> - <from>'homer'</from> + <from>'cs3-1p'</from> <to variable="IliasLoginIn" part="password"/> </copy> </assign> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel 2009-05-29 12:42:50 UTC (rev 225) @@ -8,17 +8,111 @@ xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" - xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCategory"> + xmlns:il_objs="http://cse.campussource.de/schema/ilias/objects" + xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCategory" xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions" xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" location="UpdateCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> <partnerLinks> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> <partnerLink name="IliasAdpater" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" partnerLinkType="tns:UpdateCategory" myRole="UpdateCategoryPortTypeRole"/> </partnerLinks> <variables> + <variable name="GetObjectsByTitleOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:getObjectsByTitleResponse"/> + <variable name="GetObjectsByTitleIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:getObjectsByTitleRequest"/> + <variable name="UpdateObjectsOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:updateObjectsResponse"/> + <variable name="UpdateObjectsIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:updateObjectsRequest"/> <variable name="UpdateCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryResponse"/> <variable name="UpdateCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryRequest"/> + + <!-- Category description as object in Ilias-Format --> + <variable name="CategoryXML" element="il_objs:Objects"/> + <!-- Category XML unmarshalled --> + <variable name="CategoryXMLtransformed" element="il_objs:Objects"/> </variables> <sequence> <receive name="start" createInstance="yes" partnerLink="IliasAdpater" operation="updateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" portType="tns:UpdateCategoryPortType" variable="UpdateCategoryIn"/> - <reply name="return" partnerLink="IliasAdpater" operation="updateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" portType="tns:UpdateCategoryPortType" variable="UpdateCategoryOut"/> - </sequence> + <assign name="prepareForGettingCategory"> + <copy> + <from variable="UpdateCategoryIn" part="SID"/> + <to variable="GetObjectsByTitleIn" part="sid"/> + </copy> + <copy> + <from>'test7'</from> + <to variable="GetObjectsByTitleIn" part="title"/> + </copy> + <copy> + <from>0</from> + <to variable="GetObjectsByTitleIn" part="user_id"/> + </copy> + </assign> + <invoke name="getObjectBeiTitleInvoke" partnerLink="ILIAS" operation="getObjectsByTitle" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="GetObjectsByTitleIn" outputVariable="GetObjectsByTitleOut"/> + <if name="If1"> + <condition>'' != $GetObjectsByTitleOut.object_xml</condition> + <sequence name="Sequence1"> + <assign name="unmarshalObjectXml"> + <copy> + <from>sxxf:doUnMarshal($GetObjectsByTitleOut.object_xml)</from> + <to variable="CategoryXML"/> + </copy> + </assign> + + <assign name="doXSLTransformation"> + <copy> + <from>ns0:doXslTransform('urn:stylesheets:setObjectsNS.xsl', $CategoryXML)</from> + <to variable="CategoryXMLtransformed"/> + </copy> + + </assign> + <assign name="fakeUpdateData"> + <copy> + <from>'test10'</from> + <to>$CategoryXMLtransformed/il_objs:Object/il_objs:Title</to> + </copy> + <copy> + <from>'descrTest'</from> + <to>$CategoryXMLtransformed/il_objs:Object/il_objs:Description</to> + </copy> + <copy> + <from>sxxf:current-dateTime()</from> + <to>$CategoryXMLtransformed/il_objs:Object/il_objs:LastUpdate</to> + </copy> + </assign> + <assign name="marshallCategoryXML"> + <copy> + <from>sxxf:doMarshal($CategoryXMLtransformed)</from> + <to variable="UpdateObjectsIn" part="object_xml"/> + </copy> + </assign> + <assign name="prepareForUpdateObject"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <ns0:from>concat('*** Objects-XML: ', $UpdateObjectsIn.object_xml)</ns0:from> + </sxt:log> + </sxt:trace> + <copy> + <from variable="UpdateCategoryIn" part="SID"/> + <to variable="UpdateObjectsIn" part="sid"/> + </copy> + </assign> + <invoke name="UpdateObjectInvoke" partnerLink="ILIAS" operation="updateObjects" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="UpdateObjectsIn" outputVariable="UpdateObjectsOut"/> + <assign name="prepareReply"> + <copy> + <from variable="UpdateObjectsOut" part="success"/> + <to variable="UpdateCategoryOut" part="success"/> + </copy> + </assign> + </sequence> + <else> + <assign name="noSuchCategory"> + <copy> + <from>false()</from> + <to variable="UpdateCategoryOut" part="success"/> + </copy> + </assign> + </else> + </if> + <reply name="return" partnerLink="IliasAdpater" operation="updateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" portType="tns:UpdateCategoryPortType" variable="UpdateCategoryOut"/> +</sequence> </process> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel 2009-05-29 10:05:34 UTC (rev 224) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel 2009-05-29 12:42:50 UTC (rev 225) @@ -10,15 +10,37 @@ xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCourse"> <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" partnerLinkType="tns:UpdateCourse" myRole="UpdateCoursePortTypeRole"/> </partnerLinks> <variables> + <variable name="UpdateILIASCourseOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:updateCourseResponse"/> + <variable name="UpdateILIASCourseIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:updateCourseRequest"/> <variable name="UpdateCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseResponse"/> <variable name="UpdateCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseRequest"/> </variables> <sequence> <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="updateCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" portType="tns:UpdateCoursePortType" variable="UpdateCourseIn"/> + <assign name="Assign2"> + <copy> + <from variable="UpdateCourseIn" part="SID"/> + <to variable="UpdateILIASCourseIn" part="sid"/> + </copy> + <copy> + <from>182</from> + <to variable="UpdateILIASCourseIn" part="course_id"/> + </copy> + </assign> + <invoke name="UpdateLectureInvoke" partnerLink="ILIAS" operation="updateCourse" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="UpdateILIASCourseIn" outputVariable="UpdateILIASCourseOut"/> + <assign name="prepareReply"> + <copy> + <from variable="UpdateILIASCourseOut" part="success"/> + <to variable="UpdateCourseOut" part="success"/> + </copy> + </assign> <reply name="return" partnerLink="IliasAdapter" operation="updateCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" portType="tns:UpdateCoursePortType" variable="UpdateCourseOut"/> </sequence> </process> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-05-29 10:05:41
|
Revision: 224 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=224&view=rev Author: alexloewen Date: 2009-05-29 10:05:34 +0000 (Fri, 29 May 2009) Log Message: ----------- Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5-fixed.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5.wsdl Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5-fixed.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5-fixed.wsdl 2009-05-28 15:01:40 UTC (rev 223) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5-fixed.wsdl 2009-05-29 10:05:34 UTC (rev 224) @@ -1871,7 +1871,7 @@ </binding> <service name="ILIASSoapWebservice"> <port name="ILIASSoapWebservicePort" binding="tns:ILIASSoapWebserviceBinding"> - <soap:address location="http://localhost/ilias3/webservice/soap/server.php?debug=1"/> + <soap:address location="http://cse-wwu-stage.itmc.uni-dortmund.de/ilias3/webservice/soap/server.php?debug=1"/> </port> </service> </definitions><!-- Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5.wsdl 2009-05-28 15:01:40 UTC (rev 223) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ilias-3.10.5.wsdl 2009-05-29 10:05:34 UTC (rev 224) @@ -1859,7 +1859,7 @@ </binding> <service name="ILIASSoapWebservice"> <port name="ILIASSoapWebservicePort" binding="tns:ILIASSoapWebserviceBinding"> - <soap:address location="http://localhost/ilias3/webservice/soap/server.php?debug=1"/> + <soap:address location="http://cse-wwu-stage.itmc.uni-dortmund.de/ilias3/webservice/soap/server.php?debug=1"/> </port> </service> </definitions><!-- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-28 15:01:44
|
Revision: 223 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=223&view=rev Author: pkasprzak Date: 2009-05-28 15:01:40 +0000 (Thu, 28 May 2009) Log Message: ----------- * New message-type for replies Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd Modified: trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-05-28 09:15:42 UTC (rev 222) +++ trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-05-28 15:01:40 UTC (rev 223) @@ -111,6 +111,25 @@ </xs:sequence> </xs:complexType> + <!-- New Type --> + <xs:simpleType name="statusType"> + <xs:restriction base="xs:string"> + <xs:enumeration value="SUCCESS"/> + <xs:enumeration value="ERROR"/> + </xs:restriction> + </xs:simpleType> + + <!-- New Type --> + <xs:complexType name="eventReplyMessageType"> + <xs:sequence> + <xs:element name="objectBusId" type="xs:ID"/> + <xs:element name="objectClientId" type="xs:string"/> + <xs:element name="replyTime" type="xs:dateTime"/> + <xs:element name="status" type="tns:statusType"/> + <xs:element name="info" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <!-- <xs:complexType name="eventMessageType"> <xs:sequence> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-28 09:15:50
|
Revision: 222 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=222&view=rev Author: pkasprzak Date: 2009-05-28 09:15:42 +0000 (Thu, 28 May 2009) Log Message: ----------- * Fixes * Logging Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel 2009-05-28 09:04:05 UTC (rev 221) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel 2009-05-28 09:15:42 UTC (rev 222) @@ -18,7 +18,7 @@ <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <import namespace="http://cse.campussource.de/schema/ilias/course" location="ilias-course.xsd" importType="http://www.w3.org/2001/XMLSchema"/> <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" partnerLinkType="tns:AddCourse" myRole="AddCoursePortTypeRole"/> @@ -158,7 +158,7 @@ <sequence name="addTestCategory"> <assign name="prepareAddCategory"> <copy> - <from>$AddCourseIn.SID"</from> + <from>$AddCourseIn.SID</from> <to>$AddObjectIn.sid</to> </copy> <copy> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-28 09:04:05 UTC (rev 221) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-28 09:15:42 UTC (rev 222) @@ -104,10 +104,21 @@ <!-- Branch on different events --> <if> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Branching on course-event: ', $ProcessCourseOperationIn.courseMessage/event)</from> + </sxt:log> + </sxt:trace> + <!-- Event == "CREATE" --> <condition>$ProcessCourseOperationIn.courseMessage/event = 'CREATE'</condition> <sequence> <assign name="prepareAddCourse"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** addCourse()', '')</from> + </sxt:log> + </sxt:trace> <copy> <from>$ProcessCourseOperationIn.courseMessage/course</from> <to>$AddCourseIn.course</to> @@ -129,6 +140,11 @@ <condition>$ProcessCourseOperationIn.courseMessage/event = 'UPDATE'</condition> <sequence> <assign name="prepareUpdateCourse"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** updateCourse()', '')</from> + </sxt:log> + </sxt:trace> <copy> <from>$ProcessCourseOperationIn.courseMessage/course</from> <to>$UpdateCourseIn.course</to> @@ -151,6 +167,11 @@ <condition>$ProcessCourseOperationIn.courseMessage/event = 'DELETE'</condition> <sequence> <assign name="prepareDeleteCourse"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** deleteCourse()', '')</from> + </sxt:log> + </sxt:trace> <copy> <from>$ProcessCourseOperationIn.courseMessage/course</from> <to>$DeleteCourseIn.course</to> @@ -168,6 +189,16 @@ outputVariable="DeleteCourseOut"/> </sequence> </elseif> + <else> + <!-- Unrecognized Operation: throw fault? --> + <empty> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Unknown event!', '')</from> + </sxt:log> + </sxt:trace> + </empty> + </else> </if> </sequence> @@ -197,10 +228,21 @@ <!-- Branch on different events --> <if> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Branching on category-event: ', $ProcessCategoryOperationIn.categoryMessage/event)</from> + </sxt:log> + </sxt:trace> + <!-- Event == "CREATE" --> <condition>$ProcessCategoryOperationIn.categoryMessage/event = 'CREATE'</condition> <sequence> <assign name="prepareAddCategory"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** addCategory()', '')</from> + </sxt:log> + </sxt:trace> <copy> <from>$ProcessCategoryOperationIn.categoryMessage/category</from> <to>$AddCategoryIn.category</to> @@ -221,6 +263,11 @@ <condition>$ProcessCategoryOperationIn.categoryMessage/event = 'UPDATE'</condition> <sequence> <assign name="prepareUpdateCategory"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** updateCategory()', '')</from> + </sxt:log> + </sxt:trace> <copy> <from>$ProcessCategoryOperationIn.categoryMessage/category</from> <to>$UpdateCategoryIn.category</to> @@ -242,6 +289,11 @@ <condition>$ProcessCategoryOperationIn.categoryMessage/event = 'DELETE'</condition> <sequence> <assign name="prepareDeleteCategory"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** deleteCategory()', '')</from> + </sxt:log> + </sxt:trace> <copy> <from>$ProcessCategoryOperationIn.categoryMessage/category</from> <to>$DeleteCategoryIn.category</to> @@ -258,9 +310,18 @@ outputVariable="DeleteCategoryOut"/> </sequence> </elseif> + <else> + <!-- Unrecognized Operation: throw fault? --> + <empty> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Unknown event!', '')</from> + </sxt:log> + </sxt:trace> + </empty> + </else> </if> - </sequence> </onMessage> </pick> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-28 09:04:15
|
Revision: 221 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=221&view=rev Author: pkasprzak Date: 2009-05-28 09:04:05 +0000 (Thu, 28 May 2009) Log Message: ----------- * TestCases updates * CASA layout prettying Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Concurrent.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Input.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Output.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Concurrent.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Input.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Output.xml Modified: trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa 2009-05-28 09:03:53 UTC (rev 220) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa 2009-05-28 09:04:05 UTC (rev 221) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="LSFClientAdapterCA" xmlns:ns10="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:ns2="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" xmlns:ns3="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" xmlns:ns4="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:ns5="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns6="urn:ilUserAdministration" xmlns:ns7="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" xmlns:ns8="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/newProcess" xmlns:ns9="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" xmlns:xlink="http://www.w3.org/2000/xlink"> +<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="LSFClientAdapterCA" xmlns:ns10="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCategory" xmlns:ns11="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" xmlns:ns12="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" xmlns:ns13="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:ns14="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCourse" xmlns:ns15="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" xmlns:ns16="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/UpdateCourse" xmlns:ns17="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" xmlns:ns18="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCategory" xmlns:ns19="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" xmlns:ns2="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" xmlns:ns20="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse" xmlns:ns21="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" xmlns:ns22="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns:ns23="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" xmlns:ns24="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:ns3="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" xmlns:ns4="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:ns5="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns6="urn:ilUserAdministration" xmlns:ns7="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" xmlns:ns8="http://cse.campussource.de/bpel/ILIASClientAdapter/Login" xmlns:ns9="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" xmlns:xlink="http://www.w3.org/2000/xlink"> <endpoints> <endpoint endpoint-name="casaPort1" interface-name="ns2:LSFClientAdapterPortType" name="endpoint1" service-name="ns1:casaService1"/> <endpoint endpoint-name="XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint2" service-name="ns3:XSLTTransformService"/> @@ -7,37 +7,71 @@ <endpoint endpoint-name="ObjectProcessorPortTypeBindingPort" interface-name="ns5:ObjectProcessorPortType" name="endpoint4" service-name="ns5:ObjectProcessorService"/> <endpoint endpoint-name="ILIASSoapWebservicePort" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint5" service-name="ns6:ILIASSoapWebservice"/> <endpoint endpoint-name="ILIASClientAdapterPort" interface-name="ns7:ILIASClientAdapterPortType" name="endpoint6" service-name="ns7:ILIASClientAdapterService"/> - <endpoint display-name="ILIASAdapter" endpoint-name="ILIASClientAdapterPortTypeRole_myRole" file-path="OutboundClientAdapter.bpel" interface-name="ns7:ILIASClientAdapterPortType" name="endpoint7" process-name="OutboundClientAdapter" service-name="ns8:ILIASAdapter"/> - <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint8" process-name="OutboundClientAdapter" service-name="ns8:ILIAS"/> - <endpoint display-name="ClientAdapter" endpoint-name="ObjectProcessorPortTypeRole_myRole" file-path="ObjectProcessor.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint9" process-name="ObjectProcessor" service-name="ns9:ClientAdapter"/> - <endpoint display-name="IdentityMapper" endpoint-name="IdentityMapperPortTypeRole_partnerRole" file-path="ObjectProcessor.bpel" interface-name="ns4:IdentityMapperPortType" name="endpoint10" process-name="ObjectProcessor" service-name="ns9:IdentityMapper"/> - <endpoint endpoint-name="javaee_IdentityMapperPort" interface-name="ns4:IdentityMapperPortType" name="endpoint11" service-name="ns4:IdentityMapperService"/> - <endpoint endpoint-name="javaee_XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint12" service-name="ns3:XSLTTransformService"/> - <endpoint display-name="LSF" endpoint-name="LSFClientAdapterPortTypeRole_myRole" file-path="InboundClientAdapter.bpel" interface-name="ns2:LSFClientAdapterPortType" name="endpoint13" process-name="InboundClientAdapter" service-name="ns10:LSF"/> - <endpoint display-name="XSLTTransform" endpoint-name="XSLTTransformPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns3:XSLTTransformPortType" name="endpoint14" process-name="InboundClientAdapter" service-name="ns10:XSLTTransform"/> - <endpoint display-name="ObjectProcessor" endpoint-name="ObjectProcessorPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint15" process-name="InboundClientAdapter" service-name="ns10:ObjectProcessor"/> + <endpoint display-name="IliasAdapter" endpoint-name="LoginPortTypeRole_myRole" file-path="Login.bpel" interface-name="ns9:LoginPortType" name="endpoint7" process-name="Login" service-name="ns8:IliasAdapter"/> + <endpoint display-name="IliasAdpater" endpoint-name="UpdateCategoryPortTypeRole_myRole" file-path="UpdateCategory.bpel" interface-name="ns11:UpdateCategoryPortType" name="endpoint8" process-name="UpdateCategory" service-name="ns10:IliasAdpater"/> + <endpoint display-name="IliasAdapter" endpoint-name="DeleteCategoryPortTypeRole_myRole" file-path="DeleteCategory.bpel" interface-name="ns13:DeleteCategoryPortType" name="endpoint9" process-name="DeleteCategory" service-name="ns12:IliasAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="AddCoursePortTypeRole_myRole" file-path="AddCourse.bpel" interface-name="ns15:AddCoursePortType" name="endpoint10" process-name="AddCourse" service-name="ns14:IliasAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="UpdateCoursePortTypeRole_myRole" file-path="UpdateCourse.bpel" interface-name="ns17:UpdateCoursePortType" name="endpoint11" process-name="UpdateCourse" service-name="ns16:IliasAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="AddCategoryPortTypeRole_myRole" file-path="AddCategory.bpel" interface-name="ns19:AddCategoryPortType" name="endpoint12" process-name="AddCategory" service-name="ns18:IliasAdapter"/> + <endpoint display-name="IliasAdapter" endpoint-name="DeleteCoursePortTypeRole_myRole" file-path="DeleteCourse.bpel" interface-name="ns21:DeleteCoursePortType" name="endpoint13" process-name="DeleteCourse" service-name="ns20:IliasAdapter"/> + <endpoint display-name="ILIASAdapter" endpoint-name="ILIASClientAdapterPortTypeRole_myRole" file-path="OutboundClientAdapter.bpel" interface-name="ns7:ILIASClientAdapterPortType" name="endpoint14" process-name="OutboundClientAdapter" service-name="ns22:ILIASAdapter"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="Login.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint15" process-name="Login" service-name="ns8:ILIAS"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="AddCourse.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint16" process-name="AddCourse" service-name="ns14:ILIAS"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="AddCategory.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint17" process-name="AddCategory" service-name="ns18:ILIAS"/> + <endpoint display-name="Login" endpoint-name="LoginPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns9:LoginPortType" name="endpoint18" process-name="OutboundClientAdapter" service-name="ns22:Login"/> + <endpoint display-name="AddCourse" endpoint-name="AddCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns15:AddCoursePortType" name="endpoint19" process-name="OutboundClientAdapter" service-name="ns22:AddCourse"/> + <endpoint display-name="UpdateCourse" endpoint-name="UpdateCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns17:UpdateCoursePortType" name="endpoint20" process-name="OutboundClientAdapter" service-name="ns22:UpdateCourse"/> + <endpoint display-name="DeleteCourse" endpoint-name="DeleteCoursePortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns21:DeleteCoursePortType" name="endpoint21" process-name="OutboundClientAdapter" service-name="ns22:DeleteCourse"/> + <endpoint display-name="AddCategory" endpoint-name="AddCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns19:AddCategoryPortType" name="endpoint22" process-name="OutboundClientAdapter" service-name="ns22:AddCategory"/> + <endpoint display-name="UpdateCategory" endpoint-name="UpdateCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns11:UpdateCategoryPortType" name="endpoint23" process-name="OutboundClientAdapter" service-name="ns22:UpdateCategory"/> + <endpoint display-name="DeleteCategory" endpoint-name="DeleteCategoryPortTypeRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns13:DeleteCategoryPortType" name="endpoint24" process-name="OutboundClientAdapter" service-name="ns22:DeleteCategory"/> + <endpoint display-name="ILIAS" endpoint-name="ILIASSoapWebserviceRole_partnerRole" file-path="OutboundClientAdapter.bpel" interface-name="ns6:ILIASSoapWebservicePortType" name="endpoint25" process-name="OutboundClientAdapter" service-name="ns22:ILIAS"/> + <endpoint display-name="ClientAdapter" endpoint-name="ObjectProcessorPortTypeRole_myRole" file-path="ObjectProcessor.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint26" process-name="ObjectProcessor" service-name="ns23:ClientAdapter"/> + <endpoint display-name="IdentityMapper" endpoint-name="IdentityMapperPortTypeRole_partnerRole" file-path="ObjectProcessor.bpel" interface-name="ns4:IdentityMapperPortType" name="endpoint27" process-name="ObjectProcessor" service-name="ns23:IdentityMapper"/> + <endpoint endpoint-name="javaee_IdentityMapperPort" interface-name="ns4:IdentityMapperPortType" name="endpoint28" service-name="ns4:IdentityMapperService"/> + <endpoint endpoint-name="javaee_XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint29" service-name="ns3:XSLTTransformService"/> + <endpoint display-name="LSF" endpoint-name="LSFClientAdapterPortTypeRole_myRole" file-path="InboundClientAdapter.bpel" interface-name="ns2:LSFClientAdapterPortType" name="endpoint30" process-name="InboundClientAdapter" service-name="ns24:LSF"/> + <endpoint display-name="XSLTTransform" endpoint-name="XSLTTransformPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns3:XSLTTransformPortType" name="endpoint31" process-name="InboundClientAdapter" service-name="ns24:XSLTTransform"/> + <endpoint display-name="ObjectProcessor" endpoint-name="ObjectProcessorPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns5:ObjectProcessorPortType" name="endpoint32" process-name="InboundClientAdapter" service-name="ns24:ObjectProcessor"/> </endpoints> <service-units> - <service-engine-service-unit artifacts-zip="ILIASClientAdapter.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-ILIASClientAdapter" unit-name="ILIASClientAdapter" unknown="false" x="130" y="97"> + <service-engine-service-unit artifacts-zip="ILIASClientAdapter.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-ILIASClientAdapter" unit-name="ILIASClientAdapter" unknown="false" x="593" y="37"> <provides endpoint="endpoint7"/> - <consumes endpoint="endpoint8"/> - </service-engine-service-unit> - <service-engine-service-unit artifacts-zip="Common.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-Common" unit-name="Common" unknown="false" x="160" y="255"/> - <service-engine-service-unit artifacts-zip="ObjectProcessor.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-ObjectProcessor" unit-name="ObjectProcessor" unknown="false" x="138" y="633"> + <provides endpoint="endpoint8"/> <provides endpoint="endpoint9"/> - <consumes endpoint="endpoint10"/> - </service-engine-service-unit> - <service-engine-service-unit artifacts-zip="IdentityMapper.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-IdentityMapper" unit-name="IdentityMapper" unknown="false" x="133" y="791"> + <provides endpoint="endpoint10"/> <provides endpoint="endpoint11"/> - </service-engine-service-unit> - <service-engine-service-unit artifacts-zip="XSLTTransform.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-XSLTTransform" unit-name="XSLTTransform" unknown="false" x="133" y="518"> <provides endpoint="endpoint12"/> - </service-engine-service-unit> - <service-engine-service-unit artifacts-zip="LSFClientAdapter.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-LSFClientAdapter" unit-name="LSFClientAdapter" unknown="false" x="135" y="338"> <provides endpoint="endpoint13"/> - <consumes endpoint="endpoint14"/> + <provides endpoint="endpoint14"/> <consumes endpoint="endpoint15"/> + <consumes endpoint="endpoint16"/> + <consumes endpoint="endpoint17"/> + <consumes endpoint="endpoint18"/> + <consumes endpoint="endpoint19"/> + <consumes endpoint="endpoint20"/> + <consumes endpoint="endpoint21"/> + <consumes endpoint="endpoint22"/> + <consumes endpoint="endpoint23"/> + <consumes endpoint="endpoint24"/> + <consumes endpoint="endpoint25"/> </service-engine-service-unit> + <service-engine-service-unit artifacts-zip="Common.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-Common" unit-name="Common" unknown="false" x="690" y="803"/> + <service-engine-service-unit artifacts-zip="ObjectProcessor.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-ObjectProcessor" unit-name="ObjectProcessor" unknown="false" x="154" y="599"> + <provides endpoint="endpoint26"/> + <consumes endpoint="endpoint27"/> + </service-engine-service-unit> + <service-engine-service-unit artifacts-zip="IdentityMapper.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-IdentityMapper" unit-name="IdentityMapper" unknown="false" x="374" y="789"> + <provides endpoint="endpoint28"/> + </service-engine-service-unit> + <service-engine-service-unit artifacts-zip="XSLTTransform.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-XSLTTransform" unit-name="XSLTTransform" unknown="false" x="346" y="429"> + <provides endpoint="endpoint29"/> + </service-engine-service-unit> + <service-engine-service-unit artifacts-zip="LSFClientAdapter.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-LSFClientAdapter" unit-name="LSFClientAdapter" unknown="false" x="54" y="385"> + <provides endpoint="endpoint30"/> + <consumes endpoint="endpoint31"/> + <consumes endpoint="endpoint32"/> + </service-engine-service-unit> <binding-component-service-unit artifacts-zip="sun-http-binding.jar" component-name="sun-http-binding" description="Represents this Service Unit" name="CSEIPCA-sun-http-binding" unit-name="sun-http-binding"> <ports> <port bindingType="soap" x="67" y="268"> @@ -50,7 +84,7 @@ <consumes endpoint="endpoint2"/> <provides endpoint="endpoint2"/> </port> - <port x="67" y="114"> + <port x="67" y="631"> <link xlink:href="../jbiServiceUnits/ObjectProcessor/ObjectProcessor.wsdl#xpointer(/definitions/service[@name='ObjectProcessorService']/port[@name='ObjectProcessorPortTypeBindingPort'])" xlink:type="simple"/> <consumes endpoint="endpoint4"/> <provides endpoint="endpoint4"/> @@ -65,7 +99,7 @@ <consumes endpoint="endpoint5"/> <provides endpoint="endpoint5"/> </port> - <port x="67" y="191"> + <port x="67" y="148"> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ILIASClientAdapter.wsdl#xpointer(/definitions/service[@name='ILIASClientAdapterService']/port[@name='ILIASClientAdapterPort'])" xlink:type="simple"/> <consumes endpoint="endpoint6"/> <provides endpoint="endpoint6"/> @@ -74,15 +108,25 @@ </binding-component-service-unit> </service-units> <connections> - <connection consumer="endpoint8" provider="endpoint5" state="unchanged"/> - <connection consumer="endpoint6" provider="endpoint7" state="unchanged"/> - <connection consumer="endpoint10" provider="endpoint11" state="unchanged"/> - <connection consumer="endpoint14" provider="endpoint12" state="unchanged"/> - <connection consumer="endpoint1" provider="endpoint13" state="new"/> - <connection consumer="endpoint4" provider="endpoint9" state="unchanged"/> - <connection consumer="endpoint15" provider="endpoint9" state="unchanged"/> - <connection consumer="endpoint2" provider="endpoint12" state="deleted"/> - <connection consumer="endpoint3" provider="endpoint11" state="deleted"/> + <connection consumer="endpoint18" provider="endpoint7" state="unchanged"/> + <connection consumer="endpoint15" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint16" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint17" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint25" provider="endpoint5" state="unchanged"/> + <connection consumer="endpoint20" provider="endpoint11" state="unchanged"/> + <connection consumer="endpoint27" provider="endpoint28" state="unchanged"/> + <connection consumer="endpoint31" provider="endpoint29" state="unchanged"/> + <connection consumer="endpoint1" provider="endpoint30" state="new"/> + <connection consumer="endpoint19" provider="endpoint10" state="unchanged"/> + <connection consumer="endpoint4" provider="endpoint26" state="unchanged"/> + <connection consumer="endpoint32" provider="endpoint26" state="unchanged"/> + <connection consumer="endpoint21" provider="endpoint13" state="unchanged"/> + <connection consumer="endpoint24" provider="endpoint9" state="unchanged"/> + <connection consumer="endpoint6" provider="endpoint14" state="unchanged"/> + <connection consumer="endpoint23" provider="endpoint8" state="unchanged"/> + <connection consumer="endpoint22" provider="endpoint12" state="unchanged"/> + <connection consumer="endpoint2" provider="endpoint29" state="deleted"/> + <connection consumer="endpoint3" provider="endpoint28" state="deleted"/> </connections> <porttypes> <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/portType[@name='dummyCasaPortType'])" xlink:type="simple"/> @@ -96,9 +140,16 @@ <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/META-INF/ILIASClientAdapter/src/ilias-3.10.5.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/CSEIPCA.wsdl#xpointer(/definitions/portType[@name='dummyCasaPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/AddCategory.wsdl#xpointer(/definitions/portType[@name='AddCategoryPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ILIASClientAdapter.wsdl#xpointer(/definitions/portType[@name='ILIASClientAdapterPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/DeleteCategory.wsdl#xpointer(/definitions/portType[@name='DeleteCategoryPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/DeleteCourse.wsdl#xpointer(/definitions/portType[@name='DeleteCoursePortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/UpdateCategory.wsdl#xpointer(/definitions/portType[@name='UpdateCategoryPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5-fixed.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/AddCourse.wsdl#xpointer(/definitions/portType[@name='AddCoursePortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/ilias-3.10.5.wsdl#xpointer(/definitions/portType[@name='ILIASSoapWebservicePortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/Login.wsdl#xpointer(/definitions/portType[@name='LoginPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ILIASClientAdapter/UpdateCourse.wsdl#xpointer(/definitions/portType[@name='UpdateCoursePortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> <link xlink:href="../jbiServiceUnits/IdentityMapper/META-INF/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> </porttypes> @@ -139,7 +190,7 @@ </services> <regions> <region name="WSDL Endpoints" width="150"/> - <region name="JBI Modules" width="500"/> + <region name="JBI Modules" width="902"/> <region name="External Modules" width="200"/> </regions> </casa> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Concurrent.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Concurrent.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Concurrent.properties 2009-05-28 09:04:05 UTC (rev 221) @@ -0,0 +1,13 @@ +calculatethroughput=false +#comparisontype's possible values: identical|binary|equals +comparisontype=identical +concurrentthreads=1 +description=testcase IliasAdapter_addCategory +destination=http://localhost:${HttpDefaultPort}/ILIASClientAdapterService/ILIASClientAdapterPort +#featurestatus's possible values: progress|done +featurestatus=done +inputfile=Input.xml +invokesperthread=1 +outputfile=Output.xml +soapaction= +testtimeout=30 Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Input.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Input.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCategory/Input.xml 2009-05-28 09:04:05 UTC (rev 221) @@ -0,0 +1,32 @@ +<soapenv:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ili="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"> + <soapenv:Body> + <ili:processCategory> + <categoryMessage> + <category> + <busId>1</busId> + <eventTime>?2008-09-29T03:49:45?</eventTime> + <!--Zero or more repetitions:--> + <attribute> + <name>name</name> + <value>Fakultät 4 (Sprach-, Literatur- u. Kulturwissenschaften)</value> + <transient>false</transient> + </attribute> + <!--Optional:--> + <parent>?string?</parent> + <!--Optional:--> + <categories> + <!--Zero or more repetitions:--> + <category>?string?</category> + </categories> + <!--Optional:--> + <courses> + <!--Zero or more repetitions:--> + <course>?string?</course> + </courses> + </category> + <eventTime>2004-02-14T19:44:14</eventTime> + <event>CREATE</event> + </categoryMessage> + </ili:processCategory> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Concurrent.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Concurrent.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Concurrent.properties 2009-05-28 09:04:05 UTC (rev 221) @@ -0,0 +1,13 @@ +calculatethroughput=false +#comparisontype's possible values: identical|binary|equals +comparisontype=identical +concurrentthreads=1 +description=testcase IliasAdapter_addCourse +destination=http://localhost:${HttpDefaultPort}/ILIASClientAdapterService/ILIASClientAdapterPort +#featurestatus's possible values: progress|done +featurestatus=done +inputfile=Input.xml +invokesperthread=1 +outputfile=Output.xml +soapaction= +testtimeout=30 Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Input.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Input.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/IliasAdapter_addCourse/Input.xml 2009-05-28 09:04:05 UTC (rev 221) @@ -0,0 +1,189 @@ +<soapenv:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ili="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"> + <soapenv:Body> + <ili:processCourse> + <courseMessage> + <course> + + <busId>1</busId> + <eventTime>2008-09-29T03:49:45</eventTime> + + <!--- - - - - Attribute: lsfId - - - - - --> + <attribute> + <name>lsfId</name> + <value>32350</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: logicalNumber - - - - - --> + <attribute> + <name>logicalNumber</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: type - - - - - --> + <attribute> + <name>type</name> + <value>Tutorium</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: title - - - - - --> + <attribute> + <name>title</name> + <value>Tutorium-Test</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: shortDescription - - - - - --> + <attribute> + <name>shortDescription</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: abbreviation - - - - - --> + <attribute> + <name>abbreviation</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: necessaryAssignment - - - - - --> + <attribute> + <name>necessaryAssignment</name> + <value>J</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: note - - - - - --> + <attribute> + <name>note</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: comment - - - - - --> + <attribute> + <name>comment</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: semesterAsInt - - - - - --> + <attribute> + <name>semesterAsInt</name> + <value>20081</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: semesterPeriodsPerWeek - - - - - --> + <attribute> + <name>semesterPeriodsPerWeek</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: expectedRegistrations - - - - - --> + <attribute> + <name>expectedRegistrations</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: maximumRegistrations - - - - - --> + <attribute> + <name>maximumRegistrations</name> + <value>20</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: activityConfirmation - - - - - --> + <attribute> + <name>activityConfirmation</name> + <value/> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: lectureTypeId - - - - - --> + <attribute> + <name>lectureTypeId</name> + <value>40</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: active - - - - - --> + <attribute> + <name>active</name> + <value>A</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: semesterAbbr - - - - - --> + <attribute> + <name>semesterAbbr</name> + <value>SS 2008</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: semesterFull - - - - - --> + <attribute> + <name>semesterFull</name> + <value>SS 2008</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: dates - - - - - --> + <attribute> + <name>dates</name> + <value> + + + + 14:00 + 16:00 + + + Montag + wöchentlich + + + + + 14:00 + 15:00 + + + Mittwoch + wöchentlich + + </value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: clientId - - - - - --> + <attribute> + <name>clientId</name> + <value>lecture:32350</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: semesterId - - - - - --> + <attribute> + <name>semesterId</name> + <value>20081</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: startDate - - - - - --> + <attribute> + <name>startDate</name> + <value>14.04.2008</value> + <transient>false</transient> + </attribute> + <!--- - - - - Attribute: endDate - - - - - --> + <attribute> + <name>endDate</name> + <value>18.07.2008</value> + <transient>false</transient> + </attribute> + + <!--Optional:--> + <categories> + <!--Zero or more repetitions:--> + <category>?string?</category> + </categories> + <!--Optional:--> + <parent>?string?</parent> + <!--Optional:--> + <workgroups> + <!--Zero or more repetitions:--> + <workgroup>?string?</workgroup> + </workgroups> + </course> + + <eventTime>2004-02-14T19:44:14</eventTime> + <event>CREATE</event> + </courseMessage> + </ili:processCourse> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Modified: trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties 2009-05-28 09:03:53 UTC (rev 220) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties 2009-05-28 09:04:05 UTC (rev 221) @@ -1 +1 @@ -testcases=FeedLSFAdapter +testcases=IliasAdapter_addCategory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-28 09:04:00
|
Revision: 220 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=220&view=rev Author: pkasprzak Date: 2009-05-28 09:03:53 +0000 (Thu, 28 May 2009) Log Message: ----------- * TestCases updates * CASA layout prettying Removed Paths: ------------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/FeedIliasAdapterWithCategoryMessage/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/FeedIliasAdapterWithCourseMessage/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-28 07:52:07
|
Revision: 219 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=219&view=rev Author: pkasprzak Date: 2009-05-28 07:51:59 +0000 (Thu, 28 May 2009) Log Message: ----------- * Error-Fixing * Prettying Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-28 06:08:59 UTC (rev 218) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-28 07:51:59 UTC (rev 219) @@ -19,39 +19,48 @@ <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <import namespace="http://cse.campussource.de/schema/ilias/course" location="ilias-course.xsd" importType="http://www.w3.org/2001/XMLSchema"/> <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" location="Login.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" location="AddCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" location="UpdateCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" location="Login.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" location="AddCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" location="UpdateCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> - <partnerLink name="Login" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" partnerLinkType="tns:Login" partnerRole="LoginPortTypeRole"/> - <partnerLink name="AddCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" partnerLinkType="tns:AddCourse" partnerRole="AddCoursePortTypeRole"/> - <partnerLink name="UpdateCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" partnerLinkType="tns:UpdateCourse" partnerRole="UpdateCoursePortTypeRole"/> - <partnerLink name="DeleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" partnerLinkType="tns:DeleteCourse" partnerRole="DeleteCoursePortTypeRole"/> - <partnerLink name="AddCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" partnerLinkType="tns:AddCategory" partnerRole="AddCategoryPortTypeRole"/> - <partnerLink name="UpdateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" partnerLinkType="tns:UpdateCategory" partnerRole="UpdateCategoryPortTypeRole"/> - <partnerLink name="DeleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" partnerLinkType="tns:DeleteCategory" partnerRole="DeleteCategoryPortTypeRole"/> - <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> - <partnerLink name="ILIASAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" partnerLinkType="tns:ILIASClientAdapter" myRole="ILIASClientAdapterPortTypeRole"/> + <partnerLink name="Login" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" partnerLinkType="tns:Login" + partnerRole="LoginPortTypeRole"/> + <partnerLink name="AddCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" partnerLinkType="tns:AddCourse" + partnerRole="AddCoursePortTypeRole"/> + <partnerLink name="UpdateCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" partnerLinkType="tns:UpdateCourse" + partnerRole="UpdateCoursePortTypeRole"/> + <partnerLink name="DeleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" partnerLinkType="tns:DeleteCourse" + partnerRole="DeleteCoursePortTypeRole"/> + <partnerLink name="AddCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" partnerLinkType="tns:AddCategory" + partnerRole="AddCategoryPortTypeRole"/> + <partnerLink name="UpdateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" partnerLinkType="tns:UpdateCategory" + partnerRole="UpdateCategoryPortTypeRole"/> + <partnerLink name="DeleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" partnerLinkType="tns:DeleteCategory" + partnerRole="DeleteCategoryPortTypeRole"/> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" + partnerRole="ILIASSoapWebserviceRole"/> + <partnerLink name="ILIASAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" partnerLinkType="tns:ILIASClientAdapter" + myRole="ILIASClientAdapterPortTypeRole"/> </partnerLinks> <variables> <!-- Messages --> - <variable name="DeleteCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryResponse"/> - <variable name="DeleteCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest"/> - <variable name="UpdateCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryResponse"/> - <variable name="UpdateCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryRequest"/> - <variable name="AddCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryResponse"/> - <variable name="AddCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryRequest"/> - <variable name="DeleteCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseResponse"/> - <variable name="DeleteCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseRequest"/> - <variable name="UpdateCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseResponse"/> - <variable name="UpdateCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseRequest"/> - <variable name="AddCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseResponse"/> - <variable name="AddCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseRequest"/> + <variable name="DeleteCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryResponse"/> + <variable name="DeleteCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest"/> + <variable name="UpdateCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryResponse"/> + <variable name="UpdateCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryRequest"/> + <variable name="AddCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryResponse"/> + <variable name="AddCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryRequest"/> + <variable name="DeleteCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseResponse"/> + <variable name="DeleteCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseRequest"/> + <variable name="UpdateCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseResponse"/> + <variable name="UpdateCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseRequest"/> + <variable name="AddCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseResponse"/> + <variable name="AddCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseRequest"/> <variable name="LoginOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" messageType="tns:loginResponse"/> <variable name="LoginIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" messageType="tns:loginRequest"/> <variable name="ProcessCategoryOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" messageType="tns:ProcessCategoryOperationRequest"/> @@ -193,15 +202,19 @@ <sequence> <assign name="prepareAddCategory"> <copy> - <from>$ProcessCourseOperationIn.courseMessage/course</from> - <to>$AddCourseIn.course</to> + <from>$ProcessCategoryOperationIn.categoryMessage/category</from> + <to>$AddCategoryIn.category</to> </copy> <copy> <from>$SID</from> - <to>$AddCourseIn.SID</to> + <to>$AddCategoryIn.SID</to> </copy> </assign> - <invoke name="addCategory" partnerLink="AddCategory" operation="addCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" portType="tns:AddCategoryPortType" inputVariable="AddCategoryIn" outputVariable="AddCategoryOut"/> + <invoke name="addCategory" partnerLink="AddCategory" operation="addCategory" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" + portType="tns:AddCategoryPortType" + inputVariable="AddCategoryIn" + outputVariable="AddCategoryOut"/> </sequence> <elseif> <!-- Event == "UPDATE" --> @@ -209,15 +222,19 @@ <sequence> <assign name="prepareUpdateCategory"> <copy> - <from>$ProcessCourseOperationIn.courseMessage/course</from> - <to>$UpdateCourseIn.course</to> + <from>$ProcessCategoryOperationIn.categoryMessage/category</from> + <to>$UpdateCategoryIn.category</to> </copy> <copy> <from>$SID</from> - <to>$UpdateCourseIn.SID</to> + <to>$UpdateCategoryIn.SID</to> </copy> </assign> - <invoke name="updateCategory" partnerLink="UpdateCategory" operation="updateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" portType="tns:UpdateCategoryPortType" inputVariable="UpdateCategoryIn" outputVariable="UpdateCategoryOut"/> + <invoke name="updateCategory" partnerLink="UpdateCategory" operation="updateCategory" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" + portType="tns:UpdateCategoryPortType" + inputVariable="UpdateCategoryIn" + outputVariable="UpdateCategoryOut"/> </sequence> </elseif> <elseif> @@ -226,15 +243,19 @@ <sequence> <assign name="prepareDeleteCategory"> <copy> - <from>$ProcessCourseOperationIn.courseMessage/course</from> - <to>$DeleteCourseIn.course</to> + <from>$ProcessCategoryOperationIn.categoryMessage/category</from> + <to>$DeleteCategoryIn.category</to> </copy> <copy> <from>$SID</from> - <to>$DeleteCourseIn.SID</to> + <to>$DeleteCategoryIn.SID</to> </copy> </assign> - <invoke name="deleteCategory" partnerLink="DeleteCategory" operation="deleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" portType="tns:DeleteCategoryPortType" inputVariable="DeleteCategoryIn" outputVariable="DeleteCategoryOut"/> + <invoke name="deleteCategory" partnerLink="DeleteCategory" operation="deleteCategory" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" + portType="tns:DeleteCategoryPortType" + inputVariable="DeleteCategoryIn" + outputVariable="DeleteCategoryOut"/> </sequence> </elseif> </if> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-05-28 06:09:03
|
Revision: 218 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=218&view=rev Author: pkasprzak Date: 2009-05-28 06:08:59 +0000 (Thu, 28 May 2009) Log Message: ----------- * Restructure Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ILIASClientAdapter.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCategory.wsdl trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.bpel trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/UpdateCourse.wsdl Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.bpel 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="AddCategory" + targetNamespace="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCategory" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions" + xmlns:il_objs="http://cse.campussource.de/schema/ilias/objects" + xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCategory"> + + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" location="AddCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" partnerLinkType="tns:AddCategory" myRole="AddCategoryPortTypeRole"/> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> + </partnerLinks> + + <variables> + <variable name="AddCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryResponse"/> + <variable name="AddCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryRequest"/> + <variable name="AddObjectOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:addObjectResponse"/> + <variable name="AddObjectIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:addObjectRequest"/> + + <!-- Category description as object in Ilias-Format --> + <variable name="CategoryXML" element="il_objs:Object"/> + </variables> + + <sequence> + <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="addCategory" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" + portType="tns:AddCategoryPortType" + variable="AddCategoryIn"/> + <assign name="prepareAddCategory"> + <copy> + <from>$AddCategoryIn.SID</from> + <to>$AddObjectIn.sid</to> + </copy> + <copy> + <from>1</from> + <to>$AddObjectIn.target_id</to> + </copy> + <copy> + <from> + <literal> + <Object xmlns="http://cse.campussource.de/schema/ilias/objects" type="cat"> + <Title>category1</Title> + <Description>test category</Description> + </Object> + </literal> + </from> + <to variable="CategoryXML"/> + </copy> + </assign> + + <!-- Render XML to string --> + <assign name="marshalCategoryXML"> + <copy> + <from>sxxf:doMarshal($CategoryXML)</from> + <to>$AddObjectIn.object_xml</to> + </copy> + </assign> + + <invoke name="addCategory" partnerLink="ILIAS" operation="addObject" xmlns:tns="urn:ilUserAdministration" + portType="tns:ILIASSoapWebservicePortType" + inputVariable="AddObjectIn" + outputVariable="AddObjectOut"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Adding Category: ', $AddObjectIn.object_xml)</from> + </sxt:log> + </sxt:trace> + </invoke> + + <assign name="prepareReply"> + <copy> + <from>$AddObjectOut.ref_id</from> + <to>$AddCategoryOut.categoryId</to> + </copy> + </assign> + + <reply name="returnCategoryId" partnerLink="IliasAdapter" operation="addCategory" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" + portType="tns:AddCategoryPortType" + variable="AddCategoryOut"/> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCategory.wsdl 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="AddCategory" targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" xmlns:ns="http://cse.campussource.de/schema/DataTypes" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + <types> + <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory"> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> + </xsd:schema> + </types> + <message name="AddCategoryRequest"> + <part name="SID" type="xsd:string"/> + <part name="category" type="ns:categoryType"/> + </message> + <message name="AddCategoryResponse"> + <part name="categoryId" type="xsd:int"/> + </message> + <portType name="AddCategoryPortType"> + <operation name="addCategory"> + <input name="input1" message="tns:AddCategoryRequest"/> + <output name="output1" message="tns:AddCategoryResponse"/> + </operation> + </portType> + <plnk:partnerLinkType name="AddCategory"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="AddCategoryPortTypeRole" portType="tns:AddCategoryPortType"/> + </plnk:partnerLinkType> +</definitions> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.bpel 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,297 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="AddCourse" + targetNamespace="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCourse" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions" + xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:il_crs="http://cse.campussource.de/schema/ilias/course" + xmlns:il_objs="http://cse.campussource.de/schema/ilias/objects" + xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/AddCourse"> + + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/ilias/course" location="ilias-course.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + + <partnerLinks> + <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" partnerLinkType="tns:AddCourse" myRole="AddCoursePortTypeRole"/> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> + </partnerLinks> + + <variables> + <variable name="AddCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseResponse"/> + <variable name="AddCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseRequest"/> + + <variable name="IliasAddCourseOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:addCourseResponse"/> + <variable name="IliasAddCourseIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:addCourseRequest"/> + + <variable name="AddObjectOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:addObjectResponse"/> + <variable name="AddObjectIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:addObjectRequest"/> + + <variable name="GetObjectsByTitleOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:getObjectsByTitleResponse"/> + <variable name="GetObjectsByTitleIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:getObjectsByTitleRequest"/> + + <!-- Category description as object in Ilias-Format --> + <variable name="CategoryXML" element="il_objs:Object"/> + + <!-- Result of object search for title --> + <variable name="ObjectsRawXML" element="il_objs:Objects"/> + <variable name="ObjectsXML" element="il_objs:Objects"/> + + <!-- RefId of the category used adding courses to --> + <variable name="CategoryRefId" type="xsd:integer"/> + + <!-- Course description in Ilias-Format --> + <variable name="CourseXML" element="il_crs:Course"/> + + </variables> + + <sequence> + + <!-- Init variables --> + <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="addCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" portType="tns:AddCoursePortType" variable="AddCourseIn"/> + <assign name="init"> + <copy> + <from>0</from> + <to variable="CategoryRefId"/> + </copy> + </assign> + + <!-- Prepeare search by title --> + <assign name="prepareGetObjectsByTitle"> + <copy> + <from>$AddCourseIn.SID</from> + <to>$GetObjectsByTitleIn.sid</to> + </copy> + <copy> + <from>'test'</from> + <to>$GetObjectsByTitleIn.title</to> + </copy> + <copy> + <from>0</from> + <to>$GetObjectsByTitleIn.user_id</to> + </copy> + </assign> + + <!-- Do search --> + <invoke name="getObjectsByTitle" partnerLink="ILIAS" operation="getObjectsByTitle" xmlns:tns="urn:ilUserAdministration" + portType="tns:ILIASSoapWebservicePortType" + inputVariable="GetObjectsByTitleIn" + outputVariable="GetObjectsByTitleOut"> +<!-- + BUG: java.util.logging.ErrorManager: 5: Error in extracting Name Value Pairs + java.lang.NullPointerException + <sxt:trace> + <sxt:log level="info" location="onComplete"> + <from>concat('*** ObjectsXML: ', $GetObjectsByTitleOut.object_xml)</from> + </sxt:log> + </sxt:trace> +--> + </invoke> + + <!-- Don't try to unmarshal empty string (i.e. no objects found) --> + <if> + <condition>$GetObjectsByTitleOut.object_xml != ''</condition> + <sequence name="processObjectsXML"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>'*** Processing ObjectsXML...'</from> + </sxt:log> + </sxt:trace> + + <!-- Convert to XML structure --> + <assign name="unmarshalResult" > + <copy> + <from>sxxf:doUnMarshal($GetObjectsByTitleOut.object_xml)</from> + <to variable="ObjectsRawXML"/> + </copy> + </assign> + + <assign> +<!-- + BUG: java.util.logging.ErrorManager: 5: Error in extracting Name Value Pairs + java.lang.NullPointerException + <sxt:trace> + <sxt:log level="info" location="onComplete"> + <from>concat('*** ObjectsXML (after xslt): ', sxxf:doMarshal($ObjectsXML))</from> + </sxt:log> + </sxt:trace> +--> + <copy> + <from>ns0:doXslTransform('urn:stylesheets:setObjectsNS.xsl', $ObjectsRawXML)</from> + <to variable="ObjectsXML"/> + </copy> + </assign> + + <!-- Determine, if there is a category in the result (Object/@type = "cat") and get it's refId for later --> + <assign name="checkForCategories"> + +<!-- + BUG: java.util.logging.ErrorManager: 5: Error in extracting Name Value Pairs + java.lang.NullPointerException + + <sxt:trace> + <sxt:log level="info" location="onComplete"> + <from>concat('*** CategoryRefId: ', string($CategoryRefId))</from> + </sxt:log> + </sxt:trace> +--> + <!-- Note: if an empty node is return below, it is converted by number() to "NaN" --> + <copy> + <from>number($ObjectsXML/il_objs:Object[@il_objs:type = 'cat']/il_objs:References/@il_objs:ref_id)</from> + <to variable="CategoryRefId"/> + </copy> + </assign> + </sequence> + </if> + + <!-- If no appropriate catgeory was found, create one --> + <if> + <condition>string($CategoryRefId) = 'NaN' or $CategoryRefId = 0</condition> + <sequence name="addTestCategory"> + <assign name="prepareAddCategory"> + <copy> + <from>$AddCourseIn.SID"</from> + <to>$AddObjectIn.sid</to> + </copy> + <copy> + <from>1</from> + <to>$AddObjectIn.target_id</to> + </copy> + <copy> + <from> + <literal> + <Object xmlns="http://cse.campussource.de/schema/ilias/objects" type="cat"> + <Title>test</Title> + <Description>test category</Description> + </Object> + </literal> + </from> + <to variable="CategoryXML"/> + </copy> + </assign> + + <!-- Render XML to string --> + <assign name="marshalCategoryXML"> + <copy> + <from>sxxf:doMarshal($CategoryXML)</from> + <to>$AddObjectIn.object_xml</to> + </copy> + </assign> + + <invoke name="addCategory" partnerLink="ILIAS" operation="addObject" xmlns:tns="urn:ilUserAdministration" + portType="tns:ILIASSoapWebservicePortType" + inputVariable="AddObjectIn" + outputVariable="AddObjectOut"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Adding Category: ', $AddObjectIn.object_xml)</from> + </sxt:log> + </sxt:trace> + </invoke> + + <!-- Set RefId --> + <assign name="setRefId"> + <copy> + <from>$AddObjectOut.ref_id</from> + <to variable="CategoryRefId"/> + </copy> + </assign> + </sequence> + </if> + + <!-- Initialize course xml skeleton --> + <assign name="initializeCourseXML"> + <copy> + <from> + <literal> + <Course xmlns="http://cse.campussource.de/schema/ilias/course"> + <MetaData xmlns="http://cse.campussource.de/schema/ilias/course"> + <General> + <Title Language="en">test3</Title> + <Language Language="en">en</Language> + <Description Language="en">bpel test2</Description> + </General> + </MetaData> + </Course> + </literal> + </from> + <to>$CourseXML</to> + </copy> + </assign> + + <!-- Set relevant course data --> + <assign name="setCourseData"> + <copy> +<!-- + <from>$ProcessCourseOperationIn.courseMessage/course/attribute[name = 'title']/value</from> +--> + <from>'test6'</from> + <to>$CourseXML/il_crs:MetaData/il_crs:General/il_crs:Title/text()</to> + </copy> +<!-- + <copy> + <from>$ProcessCourseOperationIn.courseMessage/course/attribute[name = 'languageISO']/value</from> + <to>$CourseXML/MetaData/General/Title/@Language</to> + </copy> + <copy> + <from>$ProcessCourseOperationIn.courseMessage/course/attribute[name = 'languageISO']/value</from> + <to>$CourseXML/MetaData/General/Language[0]/@Language</to> + </copy> +--> + </assign> + + <!-- Set all parts for addCourse call --> + <assign name="prepareAddCourse"> + <!-- Set SID --> + <copy> + <from>$AddCourseIn.SID</from> + <to variable="IliasAddCourseIn" part="sid"/> + </copy> + <!-- Set targetRefId with defaut value (= catgeory-root hopefully...) --> + <copy> + <from variable="CategoryRefId"/> + <to variable="IliasAddCourseIn" part="target_id"/> + </copy> + <!-- Set CourseXML (as string) --> + <copy> + <from>sxxf:doMarshal($CourseXML)</from> + <to variable="IliasAddCourseIn" part="crs_xml"/> + </copy> + </assign> + + <invoke name="createLecture" partnerLink="ILIAS" operation="addCourse" xmlns:tns="urn:ilUserAdministration" + portType="tns:ILIASSoapWebservicePortType" + inputVariable="IliasAddCourseIn" + outputVariable="IliasAddCourseOut"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <from>concat('*** Adding Course (refId: ', $IliasAddCourseIn.target_id, ', xml: ', $IliasAddCourseIn.crs_xml, ')')</from> + </sxt:log> + + <sxt:log level="info" location="onComplete"> + <from>concat('*** Result of addCourse: ', $IliasAddCourseOut.course_id)</from> + </sxt:log> + </sxt:trace> + </invoke> + + <assign name="prepeareReply"> + <copy> + <from>$IliasAddCourseOut.course_id</from> + <to>$AddCourseOut.courseId</to> + </copy> + </assign> + + <reply name="returnCourseId" partnerLink="IliasAdapter" operation="addCourse" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" + portType="tns:AddCoursePortType" + variable="AddCourseOut"/> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/AddCourse.wsdl 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="AddCourse" targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" xmlns:ns="http://cse.campussource.de/schema/DataTypes" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + <types> + <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse"> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> + </xsd:schema> + </types> + <message name="AddCourseRequest"> + <part name="SID" type="xsd:string"/> + <part name="course" type="ns:courseType"/> + </message> + <message name="AddCourseResponse"> + <part name="courseId" type="xsd:int"/> + </message> + <portType name="AddCoursePortType"> + <operation name="addCourse"> + <input name="input1" message="tns:AddCourseRequest"/> + <output name="output1" message="tns:AddCourseResponse"/> + </operation> + </portType> + <plnk:partnerLinkType name="AddCourse"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="AddCoursePortTypeRole" portType="tns:AddCoursePortType"/> + </plnk:partnerLinkType> +</definitions> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="DeleteCategory" + targetNamespace="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory"> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" partnerLinkType="tns:DeleteCategory" myRole="DeleteCategoryPortTypeRole"/> + </partnerLinks> + <variables> + <variable name="DeleteCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryResponse"/> + <variable name="DeleteCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest"/> + </variables> + <sequence> + <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="deleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" portType="tns:DeleteCategoryPortType" variable="DeleteCategoryIn"/> + <reply name="return" partnerLink="IliasAdapter" operation="deleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" portType="tns:DeleteCategoryPortType" variable="DeleteCategoryOut"/> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="DeleteCategory" targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:ns="http://cse.campussource.de/schema/DataTypes" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + <types> + <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory"> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> + </xsd:schema> + </types> + <message name="deleteCategoryRequest"> + <part name="SID" type="xsd:string"/> + <part name="category" type="ns:categoryType"/> + </message> + <message name="deleteCategoryResponse"> + <part name="success" type="xsd:boolean"/> + </message> + <portType name="DeleteCategoryPortType"> + <operation name="deleteCategory"> + <input name="input1" message="tns:deleteCategoryRequest"/> + <output name="output1" message="tns:deleteCategoryResponse"/> + </operation> + </portType> + <plnk:partnerLinkType name="DeleteCategory"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="DeleteCategoryPortTypeRole" portType="tns:DeleteCategoryPortType"/> + </plnk:partnerLinkType> +</definitions> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="DeleteCourse" + targetNamespace="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse"> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" partnerLinkType="tns:DeleteCourse" myRole="DeleteCoursePortTypeRole"/> + </partnerLinks> + <variables> + <variable name="DeleteCourseOperationOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseResponse"/> + <variable name="DeleteCourseOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseRequest"/> + </variables> + <sequence> + <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="deleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" portType="tns:DeleteCoursePortType" variable="DeleteCourseOperationIn"/> + <reply name="reply" partnerLink="IliasAdapter" operation="deleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" portType="tns:DeleteCoursePortType" variable="DeleteCourseOperationOut"/> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="DeleteCourse" targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" xmlns:ns="http://cse.campussource.de/schema/DataTypes" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + <types> + <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse"> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> + </xsd:schema> + </types> + <message name="DeleteCourseRequest"> + <part name="SID" type="xsd:string"/> + <part name="course" type="ns:courseType"/> + </message> + <message name="DeleteCourseResponse"> + <part name="success" type="xsd:boolean"/> + </message> + <portType name="DeleteCoursePortType"> + <operation name="deleteCourse"> + <input name="input1" message="tns:DeleteCourseRequest"/> + <output name="output1" message="tns:DeleteCourseResponse"/> + </operation> + </portType> + <plnk:partnerLinkType name="DeleteCourse"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="DeleteCoursePortTypeRole" portType="tns:DeleteCoursePortType"/> + </plnk:partnerLinkType> +</definitions> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ILIASClientAdapter.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ILIASClientAdapter.wsdl 2009-05-28 06:08:30 UTC (rev 217) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/ILIASClientAdapter.wsdl 2009-05-28 06:08:59 UTC (rev 218) @@ -15,22 +15,22 @@ <part name="categoryMessage" type="ns:categoryMessageType"/> </message> <portType name="ILIASClientAdapterPortType"> - <operation name="ProcessCourseOperation"> + <operation name="processCourse"> <input name="input1" message="tns:ProcessCourseOperationRequest"/> </operation> - <operation name="ProcessCategoryOperation"> + <operation name="processCategory"> <input name="input2" message="tns:ProcessCategoryOperationRequest"/> </operation> </portType> <binding name="ILIASClientAdapterBinding" type="tns:ILIASClientAdapterPortType"> <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="ProcessCourseOperation"> + <operation name="processCourse"> <soap:operation/> <input name="input1"> <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"/> </input> </operation> - <operation name="ProcessCategoryOperation"> + <operation name="processCategory"> <soap:operation/> <input name="input2"> <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"/> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.bpel 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="Login" + targetNamespace="http://cse.campussource.de/bpel/ILIASClientAdapter/Login" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/Login"> + + <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" location="Login.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + + <partnerLinks> + <partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" partnerLinkType="tns:Login" myRole="LoginPortTypeRole"/> + <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> + </partnerLinks> + + <variables> + <variable name="LoginOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" messageType="tns:loginResponse"/> + <variable name="LoginIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" messageType="tns:loginRequest"/> + <variable name="IliasLoginOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:loginResponse"/> + <variable name="IliasLoginIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:loginRequest"/> + </variables> + + <sequence> + + <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="login" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" + portType="tns:LoginPortType" + variable="LoginIn"/> + + <assign name="prepareLogin"> + <copy> + <from>'test'</from> + <to variable="IliasLoginIn" part="client"/> + </copy> + <copy> + <from>'root'</from> + <to variable="IliasLoginIn" part="username"/> + </copy> + <copy> + <from>'homer'</from> + <to variable="IliasLoginIn" part="password"/> + </copy> + </assign> + + <invoke name="login" partnerLink="ILIAS" operation="login" xmlns:tns="urn:ilUserAdministration" + portType="tns:ILIASSoapWebservicePortType" + inputVariable="IliasLoginIn" + outputVariable="IliasLoginOut"> + <sxt:trace> + <sxt:log level="info" location="onComplete"> + <from>concat('*** SID: ', $IliasLoginOut.sid)</from> + </sxt:log> + </sxt:trace> + </invoke> + + <assign name="prepareReply"> + <copy> + <from>$IliasLoginOut.sid</from> + <to>$LoginOut.SID</to> + </copy> + </assign> + + <reply name="replyWithSID" partnerLink="IliasAdapter" operation="login" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" + portType="tns:LoginPortType" + variable="LoginOut"/> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/Login.wsdl 2009-05-28 06:08:59 UTC (rev 218) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="Login" targetNamespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + <types/> + <message name="loginRequest"> + <part name="dummy" type="xsd:string"/> + </message> + <message name="loginResponse"> + <part name="SID" type="xsd:string"/> + </message> + <portType name="LoginPortType"> + <operation name="login"> + <input name="input1" message="tns:loginRequest"/> + <output name="output1" message="tns:loginResponse"/> + </operation> + </portType> + <plnk:partnerLinkType name="Login"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="LoginPortTypeRole" portType="tns:LoginPortType"/> + </plnk:partnerLinkType> +</definitions> Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-28 06:08:30 UTC (rev 217) +++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-05-28 06:08:59 UTC (rev 218) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <process name="OutboundClientAdapter" - targetNamespace="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/newProcess" + targetNamespace="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:xsd="http://www.w3.org/2001/XMLSchema" @@ -12,412 +12,236 @@ xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions" xmlns:il_crs="http://cse.campussource.de/schema/ilias/course" xmlns:il_objs="http://cse.campussource.de/schema/ilias/objects" - xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/newProcess"> + xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter"> <import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" location="ILIASClientAdapter.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <import namespace="http://cse.campussource.de/schema/ilias/course" location="ilias-course.xsd" importType="http://www.w3.org/2001/XMLSchema"/> <import namespace="http://cse.campussource.de/schema/ilias/objects" location="ilias-objects.xsd" importType="http://www.w3.org/2001/XMLSchema"/> - + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" location="Login.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" location="AddCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" location="UpdateCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" location="AddCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" location="UpdateCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> + <partnerLink name="Login" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" partnerLinkType="tns:Login" partnerRole="LoginPortTypeRole"/> + <partnerLink name="AddCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" partnerLinkType="tns:AddCourse" partnerRole="AddCoursePortTypeRole"/> + <partnerLink name="UpdateCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" partnerLinkType="tns:UpdateCourse" partnerRole="UpdateCoursePortTypeRole"/> + <partnerLink name="DeleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" partnerLinkType="tns:DeleteCourse" partnerRole="DeleteCoursePortTypeRole"/> + <partnerLink name="AddCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" partnerLinkType="tns:AddCategory" partnerRole="AddCategoryPortTypeRole"/> + <partnerLink name="UpdateCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" partnerLinkType="tns:UpdateCategory" partnerRole="UpdateCategoryPortTypeRole"/> + <partnerLink name="DeleteCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" partnerLinkType="tns:DeleteCategory" partnerRole="DeleteCategoryPortTypeRole"/> <partnerLink name="ILIAS" xmlns:tns="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" partnerLinkType="tns:ILIASSoapWebserviceLinkType" partnerRole="ILIASSoapWebserviceRole"/> <partnerLink name="ILIASAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" partnerLinkType="tns:ILIASClientAdapter" myRole="ILIASClientAdapterPortTypeRole"/> </partnerLinks> <variables> <!-- Messages --> + <variable name="DeleteCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryResponse"/> + <variable name="DeleteCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest"/> + <variable name="UpdateCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryResponse"/> + <variable name="UpdateCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCategory" messageType="tns:updateCategoryRequest"/> + <variable name="AddCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryResponse"/> + <variable name="AddCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCategory" messageType="tns:AddCategoryRequest"/> + <variable name="DeleteCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseResponse"/> + <variable name="DeleteCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseRequest"/> + <variable name="UpdateCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseResponse"/> + <variable name="UpdateCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/UpdateCourse" messageType="tns:updateCourseRequest"/> + <variable name="AddCourseOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseResponse"/> + <variable name="AddCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/AddCourse" messageType="tns:AddCourseRequest"/> + <variable name="LoginOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" messageType="tns:loginResponse"/> + <variable name="LoginIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" messageType="tns:loginRequest"/> <variable name="ProcessCategoryOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" messageType="tns:ProcessCategoryOperationRequest"/> <variable name="ProcessCourseOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" messageType="tns:ProcessCourseOperationRequest"/> - <variable name="AddObjectOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:addObjectResponse"/> - <variable name="AddObjectIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:addObjectRequest"/> - <variable name="GetObjectsByTitleOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:getObjectsByTitleResponse"/> - <variable name="GetObjectsByTitleIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:getObjectsByTitleRequest"/> - <variable name="AddCourseOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:addCourseResponse"/> - <variable name="AddCourseIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:addCourseRequest"/> <variable name="LogoutOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:logoutResponse"/> <variable name="LogoutIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:logoutRequest"/> - <variable name="LoginOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:loginResponse"/> - <variable name="LoginIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:loginRequest"/> <!-- Ilias --> <!-- Ilias session id --> <variable name="SID" type="xsd:string"/> - <!-- Course description in Ilias-Format --> - <variable name="CourseXML" element="il_crs:Course"/> - - <!-- RefId of the category used adding courses to --> - <variable name="CategoryRefId" type="xsd:integer"/> - - </variables> <sequence> <pick name="processObjects" createInstance="yes"> - <onMessage partnerLink="ILIASAdapter" operation="ProcessCourseOperation" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" portType="tns:ILIASClientAdapterPortType" variable="ProcessCourseOperationIn"> + <onMessage partnerLink="ILIASAdapter" operation="processCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter" + portType="tns:ILIASClientAdapterPortType" + variable="ProcessCourseOperationIn"> <sequence> - <assign name="prepareLogin"> + + <assign name="prepareLoginForCourses"> <copy> - <from>'test'</from> - <to variable="LoginIn" part="client"/> + <from>'dummy'</from> + <to>$LoginIn.dummy</to> </copy> - <copy> - <from>'root'</from> - <to variable="LoginIn" part="username"/> - </copy> - <copy> - <from>'homer'</from> - <to variable="LoginIn" part="password"/> - </copy> </assign> - <invoke name="login" partnerLink="ILIAS" operation="login" xmlns:tns="urn:ilUserAdministration" - portType="tns:ILIASSoapWebservicePortType" - inputVariable="LoginIn" - outputVariable="LoginOut"> - <sxt:trace> - <sxt:log level="info" location="onComplete"> - <from>concat('*** SID: ', $LoginOut.sid)</from> - </sxt:log> - </sxt:trace> - </invoke> - - <assign name="saveSID"> + <invoke name="loginForCourses" partnerLink="Login" operation="login" + xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/Login" + portType="tns:LoginPortType" + inputVariable="LoginIn" + outputVariable="LoginOut"/> + <assign name="saveSIDForCourses"> <copy> - <from variable="LoginOut" part="sid"/> + <from variable="LoginOut" part="SID"/> <to variable="SID"/> </copy> </assign> - <!-- Check if "test" category exists and if not add it --> - <scope name="CheckAndCreateTestCategory"> - - <variables> - <!-- Category description as object in Ilias-Format --> - <variable name="CategoryXML" element="il_objs:Object"/> - - <!-- Result of object search for title --> - <variable name="ObjectsRawXML" element="il_objs:Objects"/> - <variable name="ObjectsXML" element="il_objs:Objects"/> - - </variables> - - <sequence name="CheckForTestCategory"> - <!-- Init variables --> - <assign name="init"> + <!-- Branch on different events --> + <if> + <!-- Event == "CREATE" --> + <condition>$ProcessCourseOperationIn.courseMessage/event = 'CREATE'</condition> + <sequence> + <assign name="prepareAddCourse"> <copy> - <from>0</from> - <to variable="CategoryRefId"/> + <from>$ProcessCourseOperationIn.courseMessage/course</from> + <to>$AddCourseIn.course</to> </copy> - </assign> - - <!-- Prepeare search by title --> - <assign name="prepareGetObjectsByTitle"> <copy> - <from variable="SID"/> - <to>$GetObjectsByTitleIn.sid</to> + <from>$SID</from> + <to>$AddCourseIn.SID</to> </copy> - <copy> - <from>'test'</from> ... [truncated message content] |
From: <pka...@us...> - 2009-05-28 06:08:32
|
Revision: 217 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=217&view=rev Author: pkasprzak Date: 2009-05-28 06:08:30 +0000 (Thu, 28 May 2009) Log Message: ----------- * Restructure Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd Modified: trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-05-20 13:52:31 UTC (rev 216) +++ trunk/sandbox/lsf-adapter-demo/Common/src/CDDM.xsd 2009-05-28 06:08:30 UTC (rev 217) @@ -8,9 +8,8 @@ <xs:element name="course" type="tns:courseType"/> <xs:element name="courseMessage" type="tns:courseMessageType"/> <xs:element name="categoryMessage" type="tns:categoryMessageType"/> +<!-- <xs:element name="eventMessage" type="tns:eventMessageType"/> -<!-- - <xs:element name="attribute" type="tns:attributeType"/> --> <!-- Entity State und StateTime --> <xs:complexType name="entityType"> @@ -77,13 +76,16 @@ </xs:complexContent> </xs:complexType> - <xs:simpleType name="inputEventType"> + <xs:simpleType name="eventType"> <xs:restriction base="xs:string"> - <xs:enumeration value="CREATE_UPDATE"/> + <xs:enumeration value="CREATE_UPDATE"/> + <xs:enumeration value="CREATE"/> + <xs:enumeration value="UPDATE"/> <xs:enumeration value="DELETE"/> </xs:restriction> </xs:simpleType> +<!-- <xs:simpleType name="outputEventType"> <xs:restriction base="xs:string"> <xs:enumeration value="CREATE"/> @@ -91,23 +93,25 @@ <xs:enumeration value="DELETE"/> </xs:restriction> </xs:simpleType> +--> <xs:complexType name="courseMessageType"> <xs:sequence> - <xs:element name="course" type="tns:courseType"/> - <xs:element name="eventTime" type="xs:dateTime"/> - <xs:element name="inputEvent" type="tns:inputEventType"/> + <xs:element name="course" type="tns:courseType"/> + <xs:element name="eventTime" type="xs:dateTime"/> + <xs:element name="event" type="tns:eventType"/> </xs:sequence> </xs:complexType> <xs:complexType name="categoryMessageType"> <xs:sequence> - <xs:element name="category" type="tns:categoryType"/> - <xs:element name="eventTime" type="xs:dateTime"/> - <xs:element name="inputEvent" type="tns:inputEventType"/> + <xs:element name="category" type="tns:categoryType"/> + <xs:element name="eventTime" type="xs:dateTime"/> + <xs:element name="event" type="tns:eventType"/> </xs:sequence> </xs:complexType> +<!-- <xs:complexType name="eventMessageType"> <xs:sequence> <xs:element name="entity" type="tns:entityType"/> @@ -115,4 +119,5 @@ <xs:element name="outputEvent" type="tns:outputEventType"/> </xs:sequence> </xs:complexType> +--> </xs:schema> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-05-20 14:14:27
|
Revision: 216 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=216&view=rev Author: roekens Date: 2009-05-20 13:52:31 +0000 (Wed, 20 May 2009) Log Message: ----------- massive changes - introduced decorators (see gof decorator pattern) for domain objects -> with these decorators the annotations for jaxb and jpa are separated this forced several changes in all parts of cdmm - fixed all equals, hashCode and toString methods - fixed several tests (more to come, some xml and jpa tests are ignored atm) - introduced new package structure and refactored cdmm - etc... more to come bugfixing in progress Modified Paths: -------------- 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/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/Group.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.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/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/TestXmlConversion.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/domain/AddReferenceVisitorTest.java trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitorTest.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 trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/webservice/DataModelManagerWebServiceTest.java trunk/cse-ip/sc-cdmm/src/test/resources/META-INF/persistence.xml Added Paths: ----------- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DomainFactory.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/adapter/ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/adapter/AttributeAdapter.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/adapter/IdAdapter.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AccountJAXBDecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AttributeJAXBDecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CategoryJAXBDecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CourseJAXBDecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/GroupJAXBDecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/RoleJAXBDecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jpa/ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jpa/AccountJPADecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jpa/AttributeJPADecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jpa/CategoryJPADecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jpa/CourseJPADecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jpa/GroupJPADecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jpa/RoleJPADecorator.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/visitors/ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/visitors/AddReferenceVisitor.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/visitors/DeleteReferenceVisitor.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/visitors/ReferencesVisitor.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/visitors/Visitor.java Removed Paths: ------------- 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/DeleteReferenceVisitor.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/ReferencesVisitor.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Visitor.java 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-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java 2009-05-20 13:52:31 UTC (rev 216) @@ -7,11 +7,11 @@ import javax.ejb.Stateless; import de.campussource.cse.cdmm.dao.EntityDao; -import de.campussource.cse.cdmm.domain.AddReferenceVisitor; +import de.campussource.cse.cdmm.domain.visitors.AddReferenceVisitor; import de.campussource.cse.cdmm.domain.Entity; import de.campussource.cse.cdmm.domain.Reference; import de.campussource.cse.cdmm.domain.ReferenceType; -import de.campussource.cse.cdmm.domain.ReferencesVisitor; +import de.campussource.cse.cdmm.domain.visitors.ReferencesVisitor; import de.campussource.cse.cdmm.domain.State; import de.campussource.cse.cdmm.messages.OutputEventType; 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-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-05-20 13:52:31 UTC (rev 216) @@ -3,45 +3,22 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import de.campussource.cse.cdmm.domain.visitors.Visitor; + /** * Account entity object * @author Sebastian Roekens * */ -@Entity(name=Constants.ACCOUNT) -@Table(name = Constants.TABLENAME_ACCOUNT) -@Inheritance(strategy=InheritanceType.JOINED) -@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) -@XmlType(name=Constants.ACCOUNT_TYPE, propOrder={Constants.GROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES) + public class Account extends de.campussource.cse.cdmm.domain.Entity{ - @OneToMany(mappedBy=Constants.ACCOUNT, cascade=CascadeType.REMOVE) private List<Role> roles = new ArrayList<Role>(); - @ManyToMany - @JoinTable( - name = Constants.TABLENAME_GROUP2ACCOUNT, - joinColumns={@JoinColumn(name=Constants.COLUMNNAME_ACCOUNT_ID)}, - inverseJoinColumns={@JoinColumn(name=Constants.COLUMNNAME_GROUP_ID)}) private List<Group> groups = new ArrayList<Group>(); public Account(){ @@ -51,8 +28,6 @@ setId(id); } - @XmlElementWrapper(name=Constants.ROLES) - @XmlElement(name=Constants.ROLE) public List<Role> getRoles() { return roles; } @@ -140,9 +115,6 @@ return true; } - @XmlElementWrapper(name=Constants.GROUPS) - @XmlElement(name=Constants.GROUP) - @XmlIDREF public List<Group> getGroups() { return groups; } @@ -155,22 +127,22 @@ visitor.visit(this); } - @Override + @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()); - } + 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 int hashCode() { + if (this.getId() == null) return super.hashCode(); + else + return this.getId().hashCode(); + } + public String toString() { return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString(); } Deleted: 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 2009-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AddReferenceVisitor.java 2009-05-20 13:52:31 UTC (rev 216) @@ -1,143 +0,0 @@ -package de.campussource.cse.cdmm.domain; - -import java.util.ArrayList; -import java.util.List; - -/** - * Visitor to add Reference to an entity object. - * - * @author Ingo Dueppe - * @author Sebastian Roekens - */ -public class AddReferenceVisitor implements Visitor { - - private List<Reference> savedReferences = new ArrayList<Reference>(); - - private ReferenceType type; - - /** - * represents associated target entity in persistence - */ - private Entity persistentTarget; - - /** - * represents associated target entity in given object structure - */ - private Entity associatedTarget; - - /** - * - * @param target - * entity object to be add as reference - * @param type - * of reference that will be added - */ - public AddReferenceVisitor(Entity persistentTarget, Entity associatedTarget, ReferenceType type) { - this.type = type; - this.persistentTarget = persistentTarget; - this.associatedTarget = associatedTarget; - } - - @Override - public void visit(Account account) { - switch (type) { - case GROUP: - account.addToGroup((Group) persistentTarget); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - case ROLE: - ((Role)persistentTarget).setAccount(((Role)associatedTarget).getAccount()); - ((Role)persistentTarget).setCourse(((Role)associatedTarget).getCourse()); - ((Role)persistentTarget).setType(((Role)associatedTarget).getType()); - account.addRole((Role) persistentTarget); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Category category) { - switch (type) { - case PARENT: - category.addToParentCategory((Category) persistentTarget); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - case COURSE: - ((Course)persistentTarget).addToCategory(category); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - case CHILD: - ((Category) persistentTarget).addToParentCategory(category); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Course course) { - switch (type) { - case CATEGORY: - course.addToCategory((Category) persistentTarget); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - case WORKGROUP: - ((Course) persistentTarget).addAsWorkgroupTo(course); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - case PARENT: - course.setParent((Course) persistentTarget); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - case ROLE: - ((Role)persistentTarget).setAccount(((Role)associatedTarget).getAccount()); - ((Role)persistentTarget).setCourse(((Role)associatedTarget).getCourse()); - ((Role)persistentTarget).setType(((Role)associatedTarget).getType()); - course.addRole((Role) persistentTarget); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Group group) { - switch (type){ - case MEMBER: - ((Account)persistentTarget).addToGroup(group); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Role role) { - switch (type){ - case ACCOUNT: - ((Account)persistentTarget).addRole(role); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - case COURSE: - ((Course)persistentTarget).addRole(role); - savedReferences.add(new Reference(persistentTarget, associatedTarget, type)); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - public List<Reference> getSavedReferences() { - return savedReferences; - } - - public void setSavedReferences(List<Reference> savedReferences) { - this.savedReferences = savedReferences; - } - -} 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-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-05-20 13:52:31 UTC (rev 216) @@ -1,29 +1,17 @@ package de.campussource.cse.cdmm.domain; -import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; - /** * Attribute entity object * @author Sebastian Roekens * */ -@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) -@XmlType(name=Constants.ATTRIBUTE_TYPE, namespace=Constants.NAMESPACE_DATATYPES) -@XmlJavaTypeAdapter(value=AttributeAdapter.class) public class Attribute { - @Transient private String name; - @Transient private String value; @@ -32,7 +20,6 @@ public Attribute(){ } - @XmlElement(name=Constants.PROPERTY_TRANSIENT) public boolean isTransient() { return trans; } @@ -41,7 +28,6 @@ this.trans = trans; } - @XmlElement(name=Constants.PROPERTY_NAME) public String getName() { return name; } @@ -50,7 +36,6 @@ this.name = name; } - @XmlElement(name=Constants.PROPERTY_VALUE) public String getValue() { return value; } Deleted: 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/AttributeAdapter.java 2009-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AttributeAdapter.java 2009-05-20 13:52:31 UTC (rev 216) @@ -1,27 +0,0 @@ -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; - } - - -} 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-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-05-20 13:52:31 UTC (rev 216) @@ -3,21 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import de.campussource.cse.cdmm.domain.visitors.Visitor; /** @@ -26,22 +12,12 @@ * @author Sebastian Roekens * */ -@Entity(name = Constants.CATEGORY) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = Constants.TABLENAME_CATEGORY) -@XmlRootElement(namespace = Constants.NAMESPACE_DATATYPES) -@XmlType(name = Constants.CATEGORY_TYPE, propOrder = { Constants.PROPERTY_PARENT, Constants.PROPERTY_CHILDREN, - Constants.PROPERTY_COURSES }, namespace = Constants.NAMESPACE_DATATYPES) public class Category extends de.campussource.cse.cdmm.domain.Entity { - @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH }) - @JoinTable(name = Constants.COLUMNNAME_CATEGORY2CATEGORY) private Category parent; - @OneToMany(mappedBy = Constants.PARENT, cascade = { CascadeType.REMOVE }) private List<Category> children = new ArrayList<Category>(); - @ManyToMany(mappedBy = Constants.CATEGORIES) private List<Course> courses = new ArrayList<Course>(); public Category() { @@ -84,7 +60,10 @@ if (checkForCircularDependencies(category)) { return false; } - return this.children.add(category); + List<Category> children = getChildren(); + children.add(category); + setChildren(children); + return true; } /** @@ -99,7 +78,7 @@ public boolean addToParentCategory(Category parent) { boolean result = parent.addChild(this); if (result){ - this.parent = parent; + setParent(parent); } return result; } @@ -122,8 +101,6 @@ //FIXME self destruction of branch needed? :-) } - @XmlElementWrapper(name = Constants.CATEGORIES) - @XmlElement(name = Constants.CATEGORY) public List<Category> getChildren() { return children; } @@ -132,9 +109,6 @@ this.children = children; } - @XmlElementWrapper(name = Constants.COURSES) - @XmlElement(name = Constants.COURSE) - @XmlIDREF public List<Course> getCourses() { return courses; } @@ -143,8 +117,6 @@ this.courses = courses; } - @XmlElement(name = Constants.PARENT) - @XmlIDREF public Category getParent() { return parent; } @@ -158,7 +130,6 @@ * * @return true if category is root category, else returning false */ - @XmlTransient public boolean isRoot() { return (parent == null); } @@ -167,20 +138,20 @@ visitor.visit(this); } - @Override + @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()); - } + 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() ); } + @Override + public int hashCode() { + if (this.getId() == null) return super.hashCode(); + else + return this.getId().hashCode(); + } + } 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-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-05-20 13:52:31 UTC (rev 216) @@ -3,53 +3,25 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import de.campussource.cse.cdmm.domain.visitors.Visitor; + /** * Course entity object * @author Sebastian Roekens * */ -@Entity(name=Constants.COURSE) -@Table(name = Constants.TABLENAME_COURSE) -@Inheritance(strategy=InheritanceType.JOINED) -@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) -@XmlType(name=Constants.COURSE_TYPE, propOrder={ Constants.CATEGORIES, Constants.PARENT, Constants.WORKGROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES) public class Course extends de.campussource.cse.cdmm.domain.Entity{ - @ManyToOne(cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) - @JoinTable(name=Constants.COLUMNNAME_PARENT_ID) private Course parent; - @OneToMany(mappedBy=Constants.PARENT, cascade=CascadeType.REMOVE) private List<Course> workgroups = new ArrayList<Course>(); - @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 = new ArrayList<Category>(2); - @OneToMany(mappedBy=Constants.COURSE, cascade = {CascadeType.REMOVE}) private List<Role> roles = new ArrayList<Role>(); public Course(){ @@ -172,8 +144,6 @@ return true; } - @XmlElement(name=Constants.PARENT) - @XmlIDREF public Course getParent() { return parent; } @@ -182,8 +152,6 @@ this.parent = parent; } - @XmlElementWrapper(name=Constants.WORKGROUPS) - @XmlElement(name=Constants.WORKGROUP) public List<Course> getWorkgroups() { return workgroups; } @@ -192,9 +160,6 @@ this.workgroups = workgroups; } - @XmlElementWrapper(name=Constants.CATEGORIES) - @XmlElement(name=Constants.CATEGORY) - @XmlIDREF public List<Category> getCategories() { return categories; } @@ -203,8 +168,6 @@ this.categories = categories; } - @XmlElementWrapper(name=Constants.ROLES) - @XmlElement(name=Constants.ROLE) public List<Role> getRoles() { return roles; } @@ -221,19 +184,19 @@ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString(); } - @Override + @Override public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof Course)) { - return false; - } - if (this.getId() == null) { - return super.equals( other ); - } - else { - return this.getId().equals(((Course)other).getId()); - } + if (this == other) return true; + if (!(other instanceof Course)) return false; + if (this.getId() == null) return super.equals( other ); + else + return this.getId().equals(((Course)other).getId() ); } + + @Override + public int hashCode() { + if (this.getId() == null) return super.hashCode(); + else + return this.getId().hashCode(); + } } Deleted: 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-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java 2009-05-20 13:52:31 UTC (rev 216) @@ -1,115 +0,0 @@ -package de.campussource.cse.cdmm.domain; - - -/** - * Visitor to remove Reference to an entity object. - * - * @author Sebastian Roekens - * - */ -public class DeleteReferenceVisitor implements Visitor { - - private ReferenceType type; - - /** - * represents associated target entity in persistence - */ - private Entity persistentTarget; - - /** - * represents associated target entity in given object structure - */ - //FIXME check if needed -// private Entity associatedTarget; - - /** - * - * @param target - * entity object to be add as reference - * @param type - * of reference that will be added - */ - public DeleteReferenceVisitor(Entity persistentTarget, Entity associatedTarget, ReferenceType type) { - this.type = type; - this.persistentTarget = persistentTarget; - //FIXME check if needed -// this.associatedTarget = associatedTarget; - } - - @Override - public void visit(Account account) { - switch (type) { - case GROUP: - account.removeFromGroup((Group) persistentTarget); - break; - case ROLE: - account.removeRole((Role)persistentTarget); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Category category) { - switch (type) { - case CHILD: - ((Category)persistentTarget).removeFromParentCategory(category); - break; - case COURSE: - ((Course)persistentTarget).removeFromCategory(category); - break; - case PARENT: - category.removeFromParentCategory((Category)persistentTarget); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Course course) { - switch (type) { - case CATEGORY: - course.removeFromCategory((Category) persistentTarget); - break; - case WORKGROUP: - ((Course)persistentTarget).removeAsWorkgroupFrom(course); - break; - case PARENT: - course.removeAsWorkgroupFrom((Course)persistentTarget); - break; - case ROLE: - course.removeRole((Role)persistentTarget); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Group group) { - switch (type){ - case MEMBER: - ((Account)persistentTarget).removeFromGroup(group); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - - @Override - public void visit(Role role) { - switch(type){ - case COURSE: - ((Course)persistentTarget).removeRole(role); - break; - case ACCOUNT: - ((Account)persistentTarget).removeRole(role); - break; - default: - throw new IllegalStateException("Reference type doesn't apply to entity."); - } - } - -} Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DomainFactory.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DomainFactory.java (rev 0) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DomainFactory.java 2009-05-20 13:52:31 UTC (rev 216) @@ -0,0 +1,78 @@ +package de.campussource.cse.cdmm.domain; + +import de.campussource.cse.cdmm.domain.decorators.jpa.AccountJPADecorator; +import de.campussource.cse.cdmm.domain.decorators.jpa.AttributeJPADecorator; +import de.campussource.cse.cdmm.domain.decorators.jpa.CategoryJPADecorator; +import de.campussource.cse.cdmm.domain.decorators.jpa.CourseJPADecorator; +import de.campussource.cse.cdmm.domain.decorators.jpa.GroupJPADecorator; +import de.campussource.cse.cdmm.domain.decorators.jpa.RoleJPADecorator; +import de.campussource.cse.cdmm.domain.decorators.jaxb.AccountJAXBDecorator; +import de.campussource.cse.cdmm.domain.decorators.jaxb.AttributeJAXBDecorator; +import de.campussource.cse.cdmm.domain.decorators.jaxb.CategoryJAXBDecorator; +import de.campussource.cse.cdmm.domain.decorators.jaxb.CourseJAXBDecorator; +import de.campussource.cse.cdmm.domain.decorators.jaxb.GroupJAXBDecorator; +import de.campussource.cse.cdmm.domain.decorators.jaxb.RoleJAXBDecorator; + +public class DomainFactory { + + // Account + + public static Account account(){ + return new AccountJPADecorator(new AccountJAXBDecorator(new Account())); + } + + public static Account account(long id){ + return new AccountJPADecorator(new AccountJAXBDecorator(new Account(id))); + } + + // Attribute + + public static Attribute attribute(){ + return new AttributeJPADecorator(new AttributeJAXBDecorator(new Attribute())); + } + + // Category + + public static Category category(){ + return new CategoryJPADecorator(new CategoryJAXBDecorator(new Category())); + } + + public static Category category(long id){ + return new CategoryJPADecorator(new CategoryJAXBDecorator(new Category(id))); + } + + // Course + + public static Course course(){ + return new CourseJPADecorator(new CourseJAXBDecorator(new Course())); + } + + public static Course course(long id){ + return new CourseJPADecorator(new CourseJAXBDecorator(new Course(id))); + } + + // Group + + public static Group group(){ + return new GroupJPADecorator(new GroupJAXBDecorator(new Group())); + } + + public static Group group(long id){ + return new GroupJPADecorator(new GroupJAXBDecorator(new Group(id))); + } + + // Role + + public static Role role(long id){ + return new RoleJPADecorator(new RoleJAXBDecorator(new Role(id))); + } + + public static Role role(Long id, RoleType type) { + return new RoleJPADecorator(new RoleJAXBDecorator(new Role(id, type))); + } + + public static Role role(){ + return new RoleJPADecorator(new RoleJAXBDecorator(new Role())); + } + +} 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-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-05-20 13:52:31 UTC (rev 216) @@ -15,17 +15,12 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import javax.persistence.Version; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import de.campussource.cse.cdmm.domain.visitors.Visitor; + /** * Entity object - super class of other entity types * @@ -36,8 +31,6 @@ @javax.persistence.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 abstract class Entity { @Id @@ -69,7 +62,6 @@ return state; } - @XmlElement(name = Constants.PROPERTY_STATE) public void setState(State state) { this.state = state; } @@ -78,15 +70,10 @@ this.id = id; } - @XmlID - @XmlJavaTypeAdapter(value = IdAdapter.class) - @XmlElement(name = Constants.ID) public Long getId() { return id; } - @XmlElementWrapper(name = Constants.ATTRIBUTES) - @XmlElement(name = Constants.ATTRIBUTE) public List<Attribute> getAttributes() { return attributes; } @@ -111,7 +98,6 @@ return date; } - @XmlTransient public void setDate(Date date) { this.date = date; } @@ -121,30 +107,20 @@ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString(); } - @Override - public int hashCode() { - if (this.getId() == null) { - return super.hashCode(); - } - else { - return this.getId().hashCode(); - } + @Override + public boolean equals(Object other) { + if (this == other) return true; + if (!(other instanceof Entity)) return false; + if (this.getId() == null) return super.equals( other ); + else + return this.getId().equals(((Entity)other).getId() ); } @Override - public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof Entity)) { - return false; - } - if (this.getId() == null) { - return super.equals( other ); - } - else { - return this.getId().equals(((Entity)other).getId()); - } + public int hashCode() { + if (this.getId() == null) return super.hashCode(); + else + return this.getId().hashCode(); } public boolean isOlder(Date when) { Modified: 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/Group.java 2009-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-05-20 13:52:31 UTC (rev 216) @@ -3,60 +3,45 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import de.campussource.cse.cdmm.domain.visitors.Visitor; + /** * Group entity object * @author Sebastian Roekens * */ -@Entity(name=Constants.GROUP) -@Table(name = Constants.TABLENAME_GROUP) -@Inheritance(strategy=InheritanceType.JOINED) -@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) -@XmlType(name=Constants.GROUP_TYPE, propOrder={Constants.MEMBERS}, namespace=Constants.NAMESPACE_DATATYPES) public class Group extends Account{ - @ManyToMany(mappedBy=Constants.GROUPS, cascade={CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}) + private List<Account> members = new ArrayList<Account>(); - public Group(){ + public Group(){ } - public Group(Long id){ + public Group(Long id){ setId(id); } - @Override + @Override public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof Group)) { - return false; - } - if (this.getId() == null) { - return super.equals( other ); - } - else { - return this.getId().equals(((Group)other).getId()); - } + if (this == other) return true; + if (!(other instanceof Group)) return false; + if (this.getId() == null) return super.equals( other ); + else + return this.getId().equals(((Group)other).getId() ); } + @Override + public int hashCode() { + if (this.getId() == null) return super.hashCode(); + else + return this.getId().hashCode(); + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString(); @@ -66,9 +51,6 @@ this.members = members; } - @XmlElementWrapper(name=Constants.MEMBERS) - @XmlElement(name=Constants.MEMBER) - @XmlIDREF public List<Account> getMembers() { return members; } Deleted: 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/IdAdapter.java 2009-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/IdAdapter.java 2009-05-20 13:52:31 UTC (rev 216) @@ -1,24 +0,0 @@ -package de.campussource.cse.cdmm.domain; - -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/domain/ReferencesVisitor.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/ReferencesVisitor.java 2009-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/ReferencesVisitor.java 2009-05-20 13:52:31 UTC (rev 216) @@ -1,95 +0,0 @@ -package de.campussource.cse.cdmm.domain; - -import java.util.ArrayList; -import java.util.List; - - -/** - * Traverse References of the Entity an calls perform method with reference - * target and source entity. - * - * @author Ingo Dueppe - * - */ -public abstract class ReferencesVisitor implements Visitor { - - private List<Reference> savedReferences = new ArrayList<Reference>(); - - - /** - * Is call for each endpoint of outgoing references of an entity - * @param target entity of the reference - * @param source entity of the reference - */ - public abstract void foundReference(Entity target, Entity source, ReferenceType type); - - - @Override - public void visit(Account account) { - for (Role role : account.getRoles()) { - foundReference(role, account, ReferenceType.ROLE); - } - for (Group group : account.getGroups()) { - foundReference(group, account, ReferenceType.GROUP); - } - } - - @Override - public void visit(Category category) { - for (Category child : category.getChildren()) { - foundReference(child, category, ReferenceType.CHILD); - } - for (Course course : category.getCourses()) { - foundReference(course, category, ReferenceType.COURSE); - } - if (category.getParent() != null) - foundReference(category.getParent(), category, ReferenceType.PARENT); - } - - @Override - public void visit(Course course) { - for (Category category : course.getCategories()) { - foundReference(category, course, ReferenceType.CATEGORY); - } - for (Course workgroup : course.getWorkgroups()) { - foundReference(workgroup, course, ReferenceType.WORKGROUP); - } - if (course.getParent() != null) { - foundReference(course.getParent(), course, ReferenceType.PARENT); - } - for (Role role : course.getRoles()) { - foundReference(role, course, ReferenceType.ROLE); - } - } - - @Override - public void visit(Group group) { - for (Role role : group.getRoles()) { - foundReference(role, group, ReferenceType.ROLE); - } - for (Account account : group.getMembers()) { - foundReference(account, group, ReferenceType.MEMBER); - } - } - - @Override - public void visit(Role role) { - if (role.getCourse() != null) { - foundReference(role.getCourse(), role, ReferenceType.COURSE); - } - if (role.getAccount() != null) { - foundReference(role.getAccount(), role, ReferenceType.ACCOUNT); - } - } - - - public List<Reference> getSavedReferences() { - return savedReferences; - } - - - public void setSavedReferences(List<Reference> savedReferences) { - this.savedReferences = savedReferences; - } - -} Modified: 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/Role.java 2009-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-05-20 13:52:31 UTC (rev 216) @@ -2,22 +2,7 @@ import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import de.campussource.cse.cdmm.domain.visitors.Visitor; /** @@ -26,31 +11,28 @@ * @author Sebastian Roekens * */ -@Entity(name = Constants.ROLE) -@Table(name = Constants.TABLENAME_ROLE) -@Inheritance(strategy = InheritanceType.JOINED) -@NamedQueries(value = { @NamedQuery(name = "Role.findByAccountAndCourse", query = "select r from role r where r.account.id=:accountId and r.course.id = :courseId") }) -@XmlRootElement(namespace = Constants.NAMESPACE_DATATYPES) -@XmlType(name = Constants.ROLE_TYPE, propOrder = { Constants.TYPE, Constants.ACCOUNT, Constants.COURSE }, namespace = Constants.NAMESPACE_DATATYPES) public class Role extends de.campussource.cse.cdmm.domain.Entity { - @Column(name = Constants.COLUMNNAME_ROLE_TYPE, nullable = false, insertable = true, updatable = true) - @Enumerated(EnumType.ORDINAL) private RoleType type; - @ManyToOne(optional = false, cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH }) - @JoinColumn(name = Constants.COLUMNNAME_ACCOUNT_ID, nullable = false) private Account account; - @ManyToOne(optional = false, cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH }) - @JoinColumn(name = Constants.COLUMNNAME_COURSE_ID, nullable = false) private Course course; public static final String FIND_BY_ACCOUNT_AND_COURSE = "Role.findByAccountAndCourse"; public Role() { } + + public Role(Long id, RoleType type) { + setId(id); + this.type = type; + } + public Role(Long id) { + setId(id); + } + /** * Convenience method to add role to a course and an account. Role is added * to roles list of course and account object, and course and account are @@ -94,16 +76,6 @@ return true; } - public Role(Long id, RoleType type) { - setId(id); - this.type = type; - } - - public Role(Long id) { - setId(id); - } - - @XmlElement(name = Constants.TYPE) public RoleType getType() { return type; } @@ -112,8 +84,6 @@ this.type = type; } - @XmlElement(name = Constants.ACCOUNT_ID, required = true) - @XmlIDREF public Account getAccount() { return account; } @@ -122,8 +92,6 @@ this.account = account; } - @XmlElement(name = Constants.COURSE_ID, required = true) - @XmlIDREF public Course getCourse() { return course; } @@ -136,20 +104,20 @@ visitor.visit(this); } - @Override + @Override public boolean equals(Object other) { - if (this == other) { - return true; - } - if (!(other instanceof Role)) { - return false; - } - if (this.getId() == null) { - return super.equals( other ); - } - else { - return this.getId().equals(((Role)other).getId()); - } + if (this == other) return true; + if (!(other instanceof Role)) return false; + if (this.getId() == null) return super.equals( other ); + else + return this.getId().equals(((Role)other).getId() ); } + + @Override + public int hashCode() { + if (this.getId() == null) return super.hashCode(); + else + return this.getId().hashCode(); + } } Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Visitor.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Visitor.java 2009-05-19 09:10:23 UTC (rev 215) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Visitor.java 2009-05-20 13:52:31 UTC (rev 216) @@ -1,17 +0,0 @@ -package de.campussource.cse.cdmm.domain; - -/** - * Visitor for domain object model - * - * @author Ingo Dueppe - * - */ -public interface Visitor { - - public void visit(Account account); - public void visit(Category category); - public void visit(Course course); - public void visit(Group group); - public void visit(Role role); - -} Copied: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/adapter/AttributeAdapter.java (from rev 200, 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/adapter/AttributeAdapter.java (rev 0) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/adapter/AttributeAdapter.java 2009-05-20 13:52:31 UTC (rev 216) @@ -0,0 +1,31 @@ +package de.campussource.cse.cdmm.domain.adapter; + +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; + } + + +} Copied: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/adapter/IdAdapter.java (from rev 200, 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/adapter/IdAdapter.java (rev 0) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/adapter/IdAdapter.java 2009-05-20 13:52:31 UTC (rev 216) @@ -0,0 +1,24 @@ +package de.campussource.cse.cdmm.domain.adapter; + +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); + } + + +} Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AccountJAXBDecorator.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AccountJAXBDecorator.java (rev 0) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AccountJAXBDecorator.java 2009-05-20 13:52:31 UTC (rev 216) @@ -0,0 +1,141 @@ +package de.campussource.cse.cdmm.domain.decorators.jaxb; + +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlIDREF; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import de.campussource.cse.cdmm.domain.Account; +import de.campussource.cse.cdmm.domain.Attribute; +import de.campussource.cse.cdmm.domain.Constants; +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.domain.adapter.IdAdapter; +import de.campussource.cse.cdmm.domain.visitors.Visitor; + +@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) +@XmlType(name=Constants.ACCOUNT_TYPE, propOrder={"id", Constants.PROPERTY_STATE, Constants.PROPERTY_ATTRIBUTES, Constants.GROUPS, Constants.ROLES}, namespace=Constants.NAMESPACE_DATATYPES) +public class AccountJAXBDecorator extends Account { + + private Account target; + + public AccountJAXBDecorator(){ + this.target = new Account(); + } + + public AccountJAXBDecorator(Account account){ + this.target = account; + } + + @XmlElementWrapper(name=Constants.ROLES) + @XmlElement(name=Constants.ROLE, type=RoleJAXBDecorator.class) + public List<Role> getRoles() { + return target.getRoles(); + } + + public void setRoles(List<Role> roles) { + target.setRoles(roles); + } + + public boolean isInGroup(Group group){ + return target.isInGroup(group); + } + + public boolean addToGroup(Group group){ + return target.addToGroup(group); + } + + public boolean removeFromGroup(Group group){ + return target.removeFromGroup(group); + } + + public boolean addRole(Role role){ + return target.addRole(role); + } + + public boolean removeRole(Role role){ + return target.removeRole(role); + } + + @XmlElementWrapper(name=Constants.GROUPS) + @XmlElement(name=Constants.GROUP, type=GroupJAXBDecorator.class) + @XmlIDREF + public List<Group> getGroups() { + return target.getGroups(); + } + + public void setGroups(List<Group> groups) { + target.setGroups(groups); + } + + public void accept(Visitor visitor) { + target.accept(visitor); + } + + @Override + public boolean equals(Object other) { + return target.equals(other); + } + + @Override + public String toString() { + return target.toString(); + } + + + //Entity methods + + @XmlElement(name = Constants.PROPERTY_STATE) + public State getState() { + return target.getState(); + } + + public void setState(State state) { + target.setState(state); + } + + public void setId(Long id) { + target.setId(id); + } + + @XmlID + @XmlJavaTypeAdapter(value = IdAdapter.class) + @XmlElement(name = Constants.ID) + public Long getId() { + return target.getId(); + } + + @XmlElementWrapper(name = Constants.ATTRIBUTES) + @XmlElement(name = Constants.ATTRIBUTE, type=AttributeJAXBDecorator.class) + public List<Attribute> getAttributes() { + return target.getAttributes(); + } + + // TODO Check if this is correct + public void setAttributes(List<Attribute> attributes) { + target.setAttributes(attributes); + } + + // TODO rename in lastUpdate + @XmlTransient + public Date getDate() { + return target.getDate(); + } + + public void setDate(Date date) { + target.setDate(date); + } + + public boolean isOlder(Date when) { + return target.isOlder(when); + } + +} Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AttributeJAXBDecorator.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AttributeJAXBDecorator.java (rev 0) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/AttributeJAXBDecorator.java 2009-05-20 13:52:31 UTC (rev 216) @@ -0,0 +1,66 @@ +package de.campussource.cse.cdmm.domain.decorators.jaxb; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import de.campussource.cse.cdmm.domain.Attribute; +import de.campussource.cse.cdmm.domain.Constants; +import de.campussource.cse.cdmm.domain.adapter.AttributeAdapter; + + +@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) +@XmlType(name=Constants.ATTRIBUTE_TYPE, namespace=Constants.NAMESPACE_DATATYPES) +@XmlJavaTypeAdapter(value=AttributeAdapter.class) +public class AttributeJAXBDecorator extends Attribute { + + public Attribute target; + + public AttributeJAXBDecorator(){ + target = new Attribute(); + } + + public AttributeJAXBDecorator(Attribute attribute){ + this.target = attribute; + } + + @XmlElement(name=Constants.PROPERTY_TRANSIENT) + public boolean isTransient() { + return target.isTransient(); + } + + public void setTransient(boolean trans) { + target.setTransient(trans); + } + + @XmlElement(name=Constants.PROPERTY_NAME) + public String getName() { + return target.getName(); + } + + public void setName(String name) { + target.setName(name); + } + + @XmlElement(name=Constants.PROPERTY_VALUE) + public String getValue() { + return target.getValue(); + } + + public void setValue(String value) { + target.setValue(value); + } + + @Override + public boolean equals(Object other) { + return target.equals(other); + } + + @Override + public String toString() { + return target.toString(); + } + + +} Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CategoryJAXBDecorator.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CategoryJAXBDecorator.java (rev 0) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CategoryJAXBDecorator.java 2009-05-20 13:52:31 UTC (rev 216) @@ -0,0 +1,145 @@ +package de.campussource.cse.cdmm.domain.decorators.jaxb; + +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlIDREF; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import de.campussource.cse.cdmm.domain.Attribute; +import de.campussource.cse.cdmm.domain.Category; +import de.campussource.cse.cdmm.domain.Constants; +import de.campussource.cse.cdmm.domain.Course; +import de.campussource.cse.cdmm.domain.State; +import de.campussource.cse.cdmm.domain.adapter.IdAdapter; +import de.campussource.cse.cdmm.domain.visitors.Visitor; + + +@XmlRootElement(namespace = Constants.NAMESPACE_DATATYPES) +@XmlType(name = Constants.CATEGORY_TYPE, propOrder = {"id", Constants.PROPERTY_STATE, Constants.PROPERTY_ATTRIBUTES, Constants.PROPERTY_PARENT, Constants.PROPERTY_CHILDREN, + Constants.PROPERTY_COURSES }, namespace = Constants.NAMESPACE_DATATYPES) +public class CategoryJAXBDecorator extends Category { + + private Category target; + + public CategoryJAXBDecorator(){ + target = new Category(); + } + + public CategoryJAXBDecorator(Category category){ + this.target = category; + } + + public boolean addToParentCategory(Category parent) { + return target.addToParentCategory(parent); + } + + public boolean removeFromParentCategory(Category parent){ + return target.removeFromParentCategory(parent); + } + + @XmlElementWrapper(name = Constants.CATEGORIES) + @XmlElement(name = Constants.CATEGORY, type=CategoryJAXBDecorator.class) + public List<Category> getChildren() { + return target.getChildren(); + } + + public void setChildren(List<Category> children) { + target.setChildren(children); + } + + @XmlElementWrapper(name = Constants.COURSES) + @XmlElement(name = Constants.COURSE, type=CourseJAXBDecorator.class) + @XmlIDREF + public List<Course> getCourses() { + return target.getCourses(); + } + + public void setCourses(List<Course> courses) { + target.setCourses(courses); + } + + @XmlElement(name = Constants.PARENT, type=CategoryJAXBDecorator.class) + @XmlIDREF + public Category getParent() { + return target.getParent(); + } + + public void setParent(Category parent) { + target.setParent(parent); + } + + @XmlTransient + public boolean isRoot() { + return target.isRoot(); + } + + public void accept(Visitor visitor) { + target.accept(visitor); + } + + //Entity methods + + @XmlElement(name = Constants.PROPERTY_STATE) + public State getState() { + return target.getState(); + } + + public void setState(State state) { + target.setState(state); + } + + public void setId(Long id) { + target.setId(id); + } + + @XmlID + @XmlJavaTypeAdapter(value = IdAdapter.class) + @XmlElement(name = Constants.ID) + public Long getId() { + return target.getId(); + } + + @XmlElementWrapper(name = Constants.ATTRIBUTES) + @XmlElement(name = Constants.ATTRIBUTE, type=AttributeJAXBDecorator.class) + public List<Attribute> getAttributes() { + return target.getAttributes(); + } + + // TODO Check if this is correct + public void setAttributes(List<Attribute> attributes) { + target.setAttributes(attributes); + } + + // TODO rename in lastUpdate + @XmlTransient + public Date getDate() { + return target.getDate(); + } + + public void setDate(Date date) { + target.setDate(date); + } + + public boolean isOlder(Date when) { + return target.isOlder(when); + } + + @Override + public boolean equals(Object other) { + return target.equals(other); + } + + @Override + public String toString() { + return target.toString(); + } + + +} Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CourseJAXBDecorator.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CourseJAXBDecorator.java (rev 0) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/decorators/jaxb/CourseJAXBDecorator.java 2009-05-20 13:52:31 UTC (rev 216) @@ -0,0 +1,170 @@ +package de.campussource.cse.cdmm.d... [truncated message content] |
From: <ro...@us...> - 2009-05-19 09:11:00
|
Revision: 215 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=215&view=rev Author: roekens Date: 2009-05-19 09:10:23 +0000 (Tue, 19 May 2009) Log Message: ----------- several bugfixes and test enhancements Modified Paths: -------------- 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/dao/EntityDaoJPA.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/messages/InputMessage.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/TestXmlConversion.java trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/webservice/DataModelManagerWebServiceTest.java 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-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-05-19 09:10:23 UTC (rev 215) @@ -44,6 +44,7 @@ eventBuilder.setEventTime(message.getEventTime()); if (loaded.isOlder(input.getDate())) { ModelMergerBean merger = new ModelMergerBean(); + merger.setDao(entityDao); merger.setEventBuilder(eventBuilder); merger.merge(input); 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-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java 2009-05-19 09:10:23 UTC (rev 215) @@ -3,7 +3,7 @@ import java.util.List; import javax.ejb.EJB; -import javax.ejb.Local; +import javax.ejb.Remote; import javax.ejb.Stateless; import de.campussource.cse.cdmm.dao.EntityDao; @@ -21,10 +21,9 @@ * */ @Stateless -@Local(ModelMerger.class) +@Remote(ModelMerger.class) public class ModelMergerBean implements ModelMerger { - @EJB private EntityDao dao; private EventBuilder eventBuilder; @@ -113,13 +112,17 @@ } - public void setEntityDao(EntityDao dao) { - this.dao = dao; - } - public void setEventBuilder(EventBuilder eventBuilder) { this.eventBuilder = eventBuilder; } + public EntityDao getDao() { + return dao; + } + + public void setDao(EntityDao dao) { + this.dao = dao; + } + } Modified: 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 2009-05-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDaoJPA.java 2009-05-19 09:10:23 UTC (rev 215) @@ -1,5 +1,6 @@ package de.campussource.cse.cdmm.dao; +import javax.ejb.Local; import javax.ejb.Stateless; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; @@ -13,6 +14,7 @@ * */ @Stateless +@Local(EntityDao.class) public class EntityDaoJPA implements EntityDao { @PersistenceContext Modified: 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/Constants.java 2009-05-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Constants.java 2009-05-19 09:10:23 UTC (rev 215) @@ -38,6 +38,7 @@ public static final String MEMBER = "member"; public static final String ATTRIBUTE = "attribute"; public static final String ATTRIBUTES = "attributes"; + public static final String INPUT_MESSAGE = "inputMessageType"; //entity property names public static final String PROPERTY_ATTRIBUTES = "attributes"; Modified: 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/InputMessage.java 2009-05-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/InputMessage.java 2009-05-19 09:10:23 UTC (rev 215) @@ -3,9 +3,17 @@ import java.util.Date; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import de.campussource.cse.cdmm.domain.Account; +import de.campussource.cse.cdmm.domain.Category; import de.campussource.cse.cdmm.domain.Constants; +import de.campussource.cse.cdmm.domain.Course; import de.campussource.cse.cdmm.domain.Entity; +import de.campussource.cse.cdmm.domain.Group; +import de.campussource.cse.cdmm.domain.Role; /** @@ -29,6 +37,8 @@ * @author Sebastian Roekens * */ +@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) +@XmlType(name=Constants.INPUT_MESSAGE, propOrder={ Constants.ENTITY, Constants.EVENT_TIME, Constants.INPUT_EVENT}, namespace=Constants.NAMESPACE_DATATYPES) public class InputMessage { private Date eventTime; @@ -59,7 +69,13 @@ return entity; } - @XmlElement(name = Constants.ENTITY) + @XmlElements(value={ + @XmlElement(type=Account.class, name = Constants.ACCOUNT), + @XmlElement(type=Group.class, name = Constants.GROUP), + @XmlElement(type=Role.class, name = Constants.ROLE), + @XmlElement(type=Course.class, name = Constants.COURSE), + @XmlElement(type=Category.class, name = Constants.CATEGORY) + }) public void setEntity(Entity entity) { this.entity = entity; } Modified: 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/ModelMergerTest.java 2009-05-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/ModelMergerTest.java 2009-05-19 09:10:23 UTC (rev 215) @@ -37,7 +37,7 @@ @Before public void setUp() { ModelMergerBean modelMerger = new ModelMergerBean(); - modelMerger.setEntityDao(daoMockup); + modelMerger.setDao(daoMockup); modelMerger.setEventBuilder(builder); merger = modelMerger; Modified: trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-05-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-05-19 09:10:23 UTC (rev 215) @@ -5,6 +5,7 @@ import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.xml.bind.JAXBContext; @@ -33,6 +34,8 @@ import de.campussource.cse.cdmm.domain.Role; import de.campussource.cse.cdmm.domain.RoleType; import de.campussource.cse.cdmm.domain.TransientAttribute; +import de.campussource.cse.cdmm.messages.InputEventType; +import de.campussource.cse.cdmm.messages.InputMessage; /** * @author Sebastian Roekens @@ -305,7 +308,7 @@ JAXBContext context = null; try { context = JAXBContext.newInstance(new Class[] { EntityContainer.class, Account.class, Group.class, - Role.class, Course.class, Category.class }); + Role.class, Course.class, Category.class, InputMessage.class }); marshaller = context.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); } catch (JAXBException e) { @@ -471,6 +474,45 @@ } @Test + public void testInputMessageXml() { + System.out.println("----- entering InputMessage XML Test -----"); + + InputMessage inputMessage = new InputMessage(); + inputMessage.setEntity(new Course(1L)); + inputMessage.setEventTime(new Date()); + inputMessage.setInputEvent(InputEventType.CREATE_UPDATE); + + Marshaller marshaller = null; + JAXBContext context = null; + try { + context = JAXBContext.newInstance(InputMessage.class); + marshaller = context.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + } catch (JAXBException e) { + e.printStackTrace(); + fail(e.getMessage()); + } + + // convert group object to xml + String outputXml = ""; + try { + Writer writer = new StringWriter(); + marshaller.marshal(inputMessage, writer); + outputXml = writer.toString(); + writer.close(); + } catch (JAXBException e) { + fail(e.getMessage()); + } catch (IOException e) { + fail(e.getMessage()); + } + assertTrue((outputXml != null) && (outputXml != "")); + System.out.println(outputXml); + + System.out.println("----- leaving InputMessage XML Test -----"); + } + + + @Test public void testUnmarshalling() { String courseXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<tns:course xmlns:tns=\"http://cse.campussource.de/DataTypes\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" Modified: trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/webservice/DataModelManagerWebServiceTest.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/webservice/DataModelManagerWebServiceTest.java 2009-05-14 12:49:09 UTC (rev 214) +++ trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/webservice/DataModelManagerWebServiceTest.java 2009-05-19 09:10:23 UTC (rev 215) @@ -1,14 +1,24 @@ package de.campussource.cse.cdmm.webservice; +import static org.junit.Assert.fail; + + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; import javax.xml.ws.Endpoint; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; -import de.campussource.cse.cdmm.DataModelManager; +import de.campussource.cse.cdmm.generated.DataModelManager; import de.campussource.cse.cdmm.DataModelManagerBean; import de.campussource.cse.common.test.AbstractPersistentUnitTest; +import de.campussource.cse.cdmm.generated.CourseType; +import de.campussource.cse.cdmm.generated.DataModelManagerBeanService; +import de.campussource.cse.cdmm.generated.InputEventType; +import de.campussource.cse.cdmm.generated.InputMessageType; @@ -18,7 +28,7 @@ @Before public void setup() { - DataModelManager ejb = new DataModelManagerBean(); + de.campussource.cse.cdmm.DataModelManager ejb = new DataModelManagerBean(); autowireByType(ejb); endpoint = Endpoint.publish("http://localhost:12345/cdmm", ejb); } @@ -30,7 +40,24 @@ @Test public void testWebService() { - + txBegin(); + DataModelManager dmm = new DataModelManagerBeanService().getDataModelManagerPort(); + + InputMessageType inputCourseMessage = new InputMessageType(); + CourseType course = new CourseType(); + course.setBusId("1"); + inputCourseMessage.setCourse(course); + inputCourseMessage.setInputEvent(InputEventType.CREATE_UPDATE); + try { + inputCourseMessage.setEventTime(DatatypeFactory.newInstance().newXMLGregorianCalendar("2009-05-15T15:57:48.096+02:00")); + } catch (DatatypeConfigurationException e) { + fail("setting of event time failed"); + } + + dmm.createOrUpdate(inputCourseMessage); + + txCommit(); + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-05-14 12:49:22
|
Revision: 214 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=214&view=rev Author: roekens Date: 2009-05-14 12:49:09 +0000 (Thu, 14 May 2009) Log Message: ----------- removed unnecessary methods Modified Paths: -------------- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/EntityEventMessage.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/ReferenceEventMessage.java Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/EntityEventMessage.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/EntityEventMessage.java 2009-05-14 12:28:00 UTC (rev 213) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/EntityEventMessage.java 2009-05-14 12:49:09 UTC (rev 214) @@ -45,44 +45,6 @@ } @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((entity == null) ? 0 : entity.hashCode()); - result = prime * result + ((eventTime == null) ? 0 : eventTime.hashCode()); - result = prime * result + ((outputEvent == null) ? 0 : outputEvent.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - EntityEventMessage other = (EntityEventMessage) obj; - if (entity == null) { - if (other.entity != null) - return false; - } else if (!entity.equals(other.entity)) - return false; - if (eventTime == null) { - if (other.eventTime != null) - return false; - } else if (!eventTime.equals(other.eventTime)) - return false; - if (outputEvent == null) { - if (other.outputEvent != null) - return false; - } else if (!outputEvent.equals(other.outputEvent)) - return false; - return true; - } - - - @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append(outputEvent).append(eventTime).append(entity).toString(); } Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/ReferenceEventMessage.java =================================================================== --- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/ReferenceEventMessage.java 2009-05-14 12:28:00 UTC (rev 213) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/ReferenceEventMessage.java 2009-05-14 12:49:09 UTC (rev 214) @@ -61,58 +61,6 @@ private OutputEventType outputEvent; @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((eventTime == null) ? 0 : eventTime.hashCode()); - result = prime * result - + ((outputEvent == null) ? 0 : outputEvent.hashCode()); - result = prime * result - + ((referenceType == null) ? 0 : referenceType.hashCode()); - result = prime * result + ((source == null) ? 0 : source.hashCode()); - result = prime * result + ((target == null) ? 0 : target.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ReferenceEventMessage other = (ReferenceEventMessage) obj; - if (eventTime == null) { - if (other.eventTime != null) - return false; - } else if (!eventTime.equals(other.eventTime)) - return false; - if (outputEvent == null) { - if (other.outputEvent != null) - return false; - } else if (!outputEvent.equals(other.outputEvent)) - return false; - if (referenceType == null) { - if (other.referenceType != null) - return false; - } else if (!referenceType.equals(other.referenceType)) - return false; - if (source == null) { - if (other.source != null) - return false; - } else if (!source.equals(other.source)) - return false; - if (target == null) { - if (other.target != null) - return false; - } else if (!target.equals(other.target)) - return false; - return true; - } - - @Override public String toString(){ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append(outputEvent).append(eventTime).append(source).append(target).append(referenceType).toString(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-05-14 12:38:08
|
Revision: 213 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=213&view=rev Author: roekens Date: 2009-05-14 12:28:00 +0000 (Thu, 14 May 2009) Log Message: ----------- - fixed equals and hashCode methods in domain package Modified Paths: -------------- 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/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/Group.java trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 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:54:08 UTC (rev 212) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-05-14 12:28:00 UTC (rev 213) @@ -171,15 +171,6 @@ } } - @Override - public int hashCode() { - if (this.getId() == null) { - return super.hashCode(); - } else { - return this.getId().hashCode(); - } - } - public String toString() { return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString(); } 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-05-14 11:54:08 UTC (rev 212) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-05-14 12:28:00 UTC (rev 213) @@ -221,5 +221,19 @@ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).toString(); } - + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof Course)) { + return false; + } + if (this.getId() == null) { + return super.equals( other ); + } + else { + return this.getId().equals(((Course)other).getId()); + } + } } 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-05-14 11:54:08 UTC (rev 212) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-05-14 12:28:00 UTC (rev 213) @@ -121,30 +121,31 @@ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString(); } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); - return result; - } + @Override + public int hashCode() { + if (this.getId() == null) { + return super.hashCode(); + } + else { + return this.getId().hashCode(); + } + } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Entity other = (Entity) obj; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - return true; - } + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof Entity)) { + return false; + } + if (this.getId() == null) { + return super.equals( other ); + } + else { + return this.getId().equals(((Entity)other).getId()); + } + } public boolean isOlder(Date when) { return (date == null) || date.before(when); Modified: 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/Group.java 2009-05-14 11:54:08 UTC (rev 212) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-05-14 12:28:00 UTC (rev 213) @@ -41,31 +41,23 @@ setId(id); } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof Group)) { - return false; - } - if (this.getId() == null) { - return false; - } else { - return this.getId().equals(((Group) obj).getId()); - } - } + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof Group)) { + return false; + } + if (this.getId() == null) { + return super.equals( other ); + } + else { + return this.getId().equals(((Group)other).getId()); + } + } @Override - public int hashCode() { - if (this.getId() == null) { - return super.hashCode(); - } else { - return this.getId().hashCode(); - } - } - - @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString(); } Modified: 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/Role.java 2009-05-14 11:54:08 UTC (rev 212) +++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-05-14 12:28:00 UTC (rev 213) @@ -136,4 +136,20 @@ visitor.visit(this); } + @Override + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof Role)) { + return false; + } + if (this.getId() == null) { + return super.equals( other ); + } + else { + return this.getId().equals(((Role)other).getId()); + } + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |