From: <pka...@us...> - 2009-04-16 21:46:58
|
Revision: 121 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=121&view=rev Author: pkasprzak Date: 2009-04-16 21:46:36 +0000 (Thu, 16 Apr 2009) Log Message: ----------- * Adapted messages / variables to new datamodel (CDDM.xsd) * Course attributes are filled via xslt * Reorganized project-dependencies: common files are kept in the "Common"-Project * Cleanups Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl Removed Paths: ------------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml 2009-04-16 21:46:36 UTC (rev 121) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <nextCatalog catalog="nbproject/private/cache/retriever/catalog.xml"/> - <system systemId="file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/DataTypes.xsd" uri="src/DataTypes.xsd"/> <system systemId="IdentityMapper/wsdl/IdentityMapperWS/IdentityMapper.wsdl" uri="nb-uri:IdentityMapper#src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl"/> - <system systemId="LSFClientAdapter/XSLTTransform.wsdl" uri="nb-uri:LSFClientAdapter#src/XSLTTransform.wsdl"/> + <system systemId="Common/CDDM.xsd" uri="nb-uri:Common#src/CDDM.xsd"/> </catalog> Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml 2009-04-16 21:46:36 UTC (rev 121) @@ -106,6 +106,7 @@ <!-- You can override this target in the ../build.xml file. --> </target> <target name="-deps-jar-dist" depends="init" unless="${no.dependencies}"> + <ant target="dist_se" inheritall="false" dir="${project.Common}"/> <ant target="dist" inheritall="false" dir="${project.IdentityMapper}"/> </target> <target name="-do-dist" depends="init,-pre-dist"> @@ -141,6 +142,7 @@ <!-- You can override this target in the ../build.xml file. --> </target> <target name="-deps-clean" depends="init" unless="${no.dependencies}"> + <ant target="clean" inheritall="false" dir="${project.Common}"/> <ant target="clean" inheritall="false" dir="${project.IdentityMapper}"/> </target> <target name="-do-clean" depends="init,-pre-clean"> Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties 2009-04-16 21:46:36 UTC (rev 121) @@ -1,8 +1,8 @@ -build.xml.data.CRC32=c13bb3ad +build.xml.data.CRC32=6c6f774a build.xml.script.CRC32=3d3dbc12 build.xml.stylesheet.CRC32=1947459d # 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=c13bb3ad -nbproject/build-impl.xml.script.CRC32=664bb067 +nbproject/build-impl.xml.data.CRC32=6c6f774a +nbproject/build-impl.xml.script.CRC32=97378c31 nbproject/build-impl.xml.stylesheet.CRC32=749ec361 Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties 2009-04-16 21:46:36 UTC (rev 121) @@ -20,7 +20,9 @@ jbi.service-unit.description=Represents this Service Unit meta.inf=${source.root}/conf platform.active=default_platform +project.Common=../Common project.IdentityMapper=../IdentityMapper +reference.Common.dist_se=${project.Common}/build/SEDeployment.jar reference.IdentityMapper.dist=${project.IdentityMapper}/dist/IdentityMapper.jar resource.dir=setup sedeployment.jar=${build.dir}/SEDeployment.jar Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml 2009-04-16 21:46:36 UTC (rev 121) @@ -8,6 +8,14 @@ </data> <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> <reference> + <foreign-project>Common</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>dist_se</target> + <clean-target>clean</clean-target> + <id>dist_se</id> + </reference> + <reference> <foreign-project>IdentityMapper</foreign-project> <artifact-type>jar</artifact-type> <script>build.xml</script> Deleted: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd 2009-04-16 21:46:36 UTC (rev 121) @@ -1,264 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://cse.campussource.de/schema/DataTypes" - xmlns:tns="http://cse.campussource.de/schema/DataTypes"> - - <xs:complexType name="synchronizationMessageType"> - <xs:sequence> - <xs:element name="isDebug" type="xs:boolean"/> - <xs:element name="isSyncMessage" type="xs:boolean"/> - <xs:element name="semesterName" type="xs:string" minOccurs="0"/> - <xs:element name="semesterLsfId" type="xs:string" minOccurs="0"/> - <xs:element name="rootCategoryId" type="xs:string" minOccurs="0"/> - <xs:element name="accounts" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="account" type="tns:accountType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="courseTypes" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="courseType" type="tns:courseTypeType" 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="tns:courseType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="workgroups" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="workgroup" type="tns:workgroupType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="categories" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="category" type="tns:categoryType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="relations" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="relation" type="tns:mappedRelationType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="roles" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="role" type="tns:roleType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="lecturesToDelete" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="accountsToDelete" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="lectureTypesToDelete" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="accountType"> - <xs:complexContent> - <xs:extension base="tns:mappedEntityType"> - <xs:sequence> - <xs:element name="lsfId" type="xs:string"/> - <xs:element name="surname" type="xs:string"/> - <xs:element name="firstName" type="xs:string"/> - <xs:element name="emailAddress" type="xs:string"/> - <xs:element name="login" type="xs:string"/> - <xs:element name="password" type="xs:string"/> - <xs:element name="globalRole" type="xs:string" minOccurs="0"/> - <xs:element name="degree" type="xs:string" minOccurs="0"/> - <xs:element name="academicTitle" type="xs:string" minOccurs="0"/> - <xs:element name="gender" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="mappedEntityType" abstract="true"> - <xs:complexContent> - <xs:extension base="tns:mappedObjectType"> - <xs:sequence/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="mappedObjectType" abstract="true"> - <xs:sequence> - <xs:element name="busId" type="xs:int"/> - <xs:element name="clientId" type="xs:string" minOccurs="0"/> - <xs:element name="operation" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="courseTypeType"> - <xs:complexContent> - <xs:extension base="tns:mappedEntityType"> - <xs:sequence> - <xs:element name="lsfId" type="xs:int"/> - <xs:element name="name" type="xs:string"/> - <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> - <xs:element name="longDescription" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="courseType"> - <xs:complexContent> - <xs:extension base="tns:mappedEntityType"> - <xs:sequence> - <xs:element name="dates" minOccurs="0"> - <xs:complexType> - <xs:sequence> - <xs:element name="date" type="tns:dateType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="active" type="xs:string" minOccurs="0"/> - <xs:element name="abbreviation" type="xs:string" minOccurs="0"/> - <xs:element name="lsfId" type="xs:string"/> - <xs:element name="logicalNumber" type="xs:int"/> - <xs:element name="type" type="xs:string" minOccurs="0"/> - <xs:element name="title" type="xs:string"/> - <xs:element name="semesterId" type="xs:string"/> - <xs:element name="clientTitle" type="xs:string" minOccurs="0"/> - <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> - <xs:element name="prerequisites" type="xs:string" minOccurs="0"/> - <xs:element name="necessaryAssignment" type="xs:string" minOccurs="0"/> - <xs:element name="languageISO" type="xs:string" minOccurs="0"/> - <xs:element name="languageFull" type="xs:string" minOccurs="0"/> - <xs:element name="hyperlink" type="xs:string" minOccurs="0"/> - <xs:element name="hyperlinkname" type="xs:string" minOccurs="0"/> - <xs:element name="note" type="xs:string" minOccurs="0"/> - <xs:element name="comment" type="xs:string" minOccurs="0"/> - <xs:element name="semesterAsInt" type="xs:short"/> - <xs:element name="semesterAbbr" type="xs:string" minOccurs="0"/> - <xs:element name="semesterFull" type="xs:string" minOccurs="0"/> - <xs:element name="semesterPeriodsPerWeek" type="xs:int"/> - <xs:element name="expectedRegistrations" type="xs:int"/> - <xs:element name="maximumRegistrations" type="xs:int"/> - <xs:element name="activityConfirmation" type="xs:string" minOccurs="0"/> - <xs:element name="literature" type="xs:string" minOccurs="0"/> - <xs:element name="startDate" type="xs:string" minOccurs="0"/> - <xs:element name="endDate" type="xs:string" minOccurs="0"/> - <xs:element name="superRoleBusId" type="xs:int"/> - <xs:element name="assignmentManagement" type="xs:string" minOccurs="0"/> - <xs:element name="leadingSystemForAssigments" type="xs:string" minOccurs="0"/> - <xs:element name="bookingType" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="dateType"> - <xs:sequence> - <xs:element name="dateId" type="xs:int"/> - <xs:element name="startdate" type="xs:string" minOccurs="0"/> - <xs:element name="enddate" type="xs:string" minOccurs="0"/> - <xs:element name="starttime" type="xs:string" minOccurs="0"/> - <xs:element name="endtime" type="xs:string" minOccurs="0"/> - <xs:element name="stct" type="xs:string" minOccurs="0"/> - <xs:element name="dayofweek" type="xs:string" minOccurs="0"/> - <xs:element name="rythm" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="workgroupType"> - <xs:complexContent> - <xs:extension base="tns:mappedEntityType"> - <xs:sequence> - <xs:element name="lsfId" type="xs:string"/> - <xs:element name="name" type="xs:string"/> - <xs:element name="room" type="xs:string" minOccurs="0"/> - <xs:element name="semesterId" type="xs:string"/> - <xs:element name="clientTitle" type="xs:string" minOccurs="0"/> - <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> - <xs:element name="languageISO" type="xs:string" minOccurs="0"/> - <xs:element name="maximumRegistrations" type="xs:int"/> - <xs:element name="startDate" type="xs:string" minOccurs="0"/> - <xs:element name="endDate" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="categoryType"> - <xs:complexContent> - <xs:extension base="tns:mappedEntityType"> - <xs:sequence> - <xs:element name="name" type="xs:string"/> - <xs:element name="lsfId" type="xs:string"/> - <xs:element name="sort" type="xs:int"/> - <xs:element name="semesterId" type="xs:string"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="mappedRelationType"> - <xs:complexContent> - <xs:extension base="tns:mappedObjectType"> - <xs:sequence> - <xs:element name="busParentId" type="xs:int"/> - <xs:element name="busChildId" type="xs:int"/> - <xs:element name="clientChildId" type="xs:string" minOccurs="0"/> - <xs:element name="clientParentId" type="xs:string" minOccurs="0"/> - <xs:element name="relationType" type="xs:string" minOccurs="0"/> - <xs:element name="childSort" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="roleType"> - <xs:complexContent> - <xs:extension base="tns:mappedObjectType"> - <xs:sequence> - <xs:element name="name" type="xs:string"/> - <xs:element name="clientAccountId" type="xs:string" minOccurs="0"/> - <xs:element name="clientObjectId" type="xs:string" minOccurs="0"/> - <xs:element name="busAccountId" type="xs:int"/> - <xs:element name="busObjectId" type="xs:int"/> - <xs:element name="roleStatus" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="resultType"> - <xs:sequence> - <xs:element name="clientId" type="xs:string"/> - <xs:element name="status" type="xs:string"/> - <xs:element name="reason" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:element name="synchronizationMessage" type="tns:synchronizationMessageType"/> -</xs:schema> \ No newline at end of file Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel 2009-04-16 21:46:36 UTC (rev 121) @@ -8,44 +8,75 @@ 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/"/> - <import namespace="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" location="LSFClientAdapter/XSLTTransform.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="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"/> - <variable name="ProcessObjectOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" messageType="tns:ProcessObjectOperationRequest"/> - </variables> - <sequence> - <receive name="receiveObject" createInstance="yes" partnerLink="ClientAdapter" operation="ProcessObjectOperation" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" portType="tns:ObjectProcessorPortType" variable="ProcessObjectOperationIn"> - <sxt:trace> - <sxt:log level="fine" location="onStart"> - <from>'ObjectProcessor called!'</from> - </sxt:log> - </sxt:trace> - </receive> - <assign name="prepareResolveBusId"> - <copy> - <from variable="ProcessObjectOperationIn" part="clientInstanceId"/> - <to variable="ToBusIdOperationIn" part="clientInstanceId"/> - </copy> - <copy> - <from>$ProcessObjectOperationIn.objectMessage/courses/course[1]/clientId</from> - <to variable="ToBusIdOperationIn" part="clientObjectId"/> - </copy> - </assign> - <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> + + <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> Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl 2009-04-16 21:46:18 UTC (rev 120) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl 2009-04-16 21:46:36 UTC (rev 121) @@ -2,21 +2,53 @@ <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:ns="http://cse.campussource.de/schema/DataTypes" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + 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="file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/DataTypes.xsd"/> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="Common/CDDM.xsd"/> </xsd:schema> </types> - <message name="ProcessObjectOperationRequest"> - <part name="clientInstanceId" type="xsd:long"/> - <part name="objectMessage" type="ns:synchronizationMessageType"/> + <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="ProcessObjectOperation"> - <input name="input1" message="tns:ProcessObjectOperationRequest"/> + <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. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |