|
From: <pka...@us...> - 2009-07-31 09:39:05
|
Revision: 410
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=410&view=rev
Author: pkasprzak
Date: 2009-07-31 09:38:55 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
* Use LoggingManager for logging
* Fixes of 'update'-path
Modified Paths:
--------------
trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml
trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/AddCourse.bpel
Added Paths:
-----------
trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/prepareUpdateAttributesCall.xsl
Removed Paths:
-------------
trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/toEntity.xsl
Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml 2009-07-30 18:17:08 UTC (rev 409)
+++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml 2009-07-31 09:38:55 UTC (rev 410)
@@ -9,4 +9,5 @@
<system systemId="Common/DependencyManagerNotification.wsdl" uri="nb-uri:Common#src/DependencyManagerNotification.wsdl"/>
<system systemId="Common/DependencyManager.wsdl" uri="nb-uri:Common#src/DependencyManager.wsdl"/>
<system systemId="Common/SystemManager.wsdl" uri="nb-uri:Common#src/SystemManager.wsdl"/>
+ <system systemId="Common/LoggingManager.wsdl" uri="nb-uri:Common#src/LoggingManager.wsdl"/>
</catalog>
Modified: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/AddCourse.bpel
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/AddCourse.bpel 2009-07-30 18:17:08 UTC (rev 409)
+++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/AddCourse.bpel 2009-07-31 09:38:55 UTC (rev 410)
@@ -21,9 +21,14 @@
<import namespace="http://j2ee.netbeans.org/wsdl/Common/DependencyManagerNotification" location="Common/DependencyManagerNotification.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
-->
- <import namespace="http://cse.campussource.de/ejb/DependencyManager" location="Common/DependencyManager.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/><import namespace="http://cse.campussource.de/ejb/SystemManager" location="Common/SystemManager.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://cse.campussource.de/ejb/DependencyManager" location="Common/DependencyManager.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://cse.campussource.de/ejb/SystemManager" location="Common/SystemManager.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://cse.campussource.de/ejb/LoggingManager" location="Common/LoggingManager.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
<partnerLinks>
+ <partnerLink name="LoggingManager" xmlns:tns="http://cse.campussource.de/ejb/LoggingManager" partnerLinkType="tns:LoggingManagerLinkType"
+ partnerRole="LoggingManagerRole"/>
+
<partnerLink name="EntityManager" xmlns:tns="http://cse.campussource.de/ejb/EntityManager" partnerLinkType="tns:EntityManagerLinkType"
partnerRole="EntityManagerRole"/>
@@ -59,8 +64,12 @@
<variable name="ExistsIn" xmlns:tns="http://cse.campussource.de/ejb/EntityManager" messageType="tns:exists"/>
<variable name="ProcessCourseIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/AddCourse" messageType="tns:processCourseRequest"/>
+ <!-- Logging -->
+ <variable name="DebugIn" xmlns:tns="http://cse.campussource.de/ejb/LoggingManager" messageType="tns:debug"/>
+
<!-- CSE-id of the course -->
<variable name="CseId" type="xsd:integer"/>
+
</variables>
<correlationSets>
@@ -72,6 +81,13 @@
xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/AddCourse"
portType="tns:AddCoursePortType"
variable="ProcessCourseIn"/>
+ <assign name="init">
+ <!-- Init logging -->
+ <copy>
+ <from>'ObjectProcessor:AddCourse'</from>
+ <to>$DebugIn.parameters/process</to>
+ </copy>
+ </assign>
<assign name="prepareCheckIfAlreadyExists">
<!-- Set system -->
@@ -153,6 +169,13 @@
<else>
<sequence name="CourseAlreadyExists">
+ <assign name="setCseId">
+ <copy>
+ <from variable="CseId"/>
+ <to>$ProcessCourseIn.courseMessage/dt:course/dt:busId</to>
+ </copy>
+ </assign>
+
<empty name="peristUpdatedAttributes">
<documentation>-> EntityManager: persist any attributes that have changed and report if attributes have changed
@@ -166,8 +189,8 @@
<assign name="prepareUpdateAttributes">
<copy>
- <from>x:doXslTransform('urn:stylesheets:toEntity.xsl', $ProcessCourseIn.courseMessage/dt:course)</from>
- <to>$UpdateAttributesIn.parameters/entity</to>
+ <from>x:doXslTransform('urn:stylesheets:prepareUpdateAttributesCall.xsl', $ProcessCourseIn.courseMessage/dt:course)</from>
+ <to>$UpdateAttributesIn.parameters</to>
</copy>
</assign>
@@ -230,29 +253,24 @@
</copy>
</assign>
- <empty>
- <sxt:trace>
- <sxt:log level="info" location="onStart">
- <ns0:from>'*** Before getOutboundSystems()'</ns0:from>
- </sxt:log>
- </sxt:trace>
- </empty>
-
<invoke name="getOutboundSystems" partnerLink="SystemManager" operation="getOutboundSystems"
xmlns:tns="http://cse.campussource.de/ejb/SystemManager"
portType="tns:SystemManager"
inputVariable="GetOutboundSystemsIn"
outputVariable="GetOutboundSystemsOut"/>
- <!-- test -->
- <empty>
- <sxt:trace>
- <sxt:log level="info" location="onStart">
- <ns0:from>concat('*** After getOutboundSystems():', sxxf:doMarshal($GetOutboundSystemsOut.parameters))</ns0:from>
- </sxt:log>
- </sxt:trace>
- </empty>
+ <assign>
+ <copy>
+ <from>concat('Outbound-systems: ', sxxf:doMarshal($GetOutboundSystemsOut.parameters))</from>
+ <to>$DebugIn.parameters/message</to>
+ </copy>
+ </assign>
+ <invoke partnerLink="LoggingManager" operation="debug"
+ xmlns:tns="http://cse.campussource.de/ejb/LoggingManager"
+ portType="tns:LoggingManager"
+ inputVariable="DebugIn"/>
+
<forEach name="Distribute" parallel="no" counterName="SystemCounter">
<startCounterValue>1</startCounterValue>
@@ -261,35 +279,37 @@
<scope name="SystemScope">
<variables>
+
<variable name="NotifyIn" messageType="ns0:notifyRequest"/>
<variable name="System" type="xsd:string"/>
<variable name="EntityId" type="xsd:int"/>
</variables>
- <sequence name="Sequence2">
+ <sequence>
+ <assign>
+ <copy>
+ <from>'Waiting for notification...'</from>
+ <to>$DebugIn.parameters/message</to>
+ </copy>
+ </assign>
+
+ <invoke partnerLink="LoggingManager" operation="debug"
+ xmlns:tns="http://cse.campussource.de/ejb/LoggingManager"
+ portType="tns:LoggingManager"
+ inputVariable="DebugIn"/>
+
<receive name="receiveNotification" createInstance="no" partnerLink="DependencyManager"
operation="notify"
portType="ns0:DependencyManagerNotification"
variable="NotifyIn">
- <sxt:trace>
- <sxt:log level="info" location="onStart">
- <ns0:from>concat('*** Waiting for notification...', '')</ns0:from>
- </sxt:log>
- </sxt:trace>
-
<correlations>
<correlation set="DependencyManager" initiate="no"/>
</correlations>
</receive>
<assign name="setSystem">
- <sxt:trace>
- <sxt:log level="info" location="onComplete">
- <ns0:from>concat('*** Received notification: (', $System, ',', $EntityId, ')')</ns0:from>
- </sxt:log>
- </sxt:trace>
<copy>
<from>$NotifyIn.system</from>
<to>$System</to>
@@ -300,6 +320,19 @@
</copy>
</assign>
+ <assign>
+ <copy>
+ <from>concat('Received notification: (', $System, ',', $EntityId, ')')</from>
+ <to>$DebugIn.parameters/message</to>
+ </copy>
+ </assign>
+
+ <invoke partnerLink="LoggingManager" operation="debug"
+ xmlns:tns="http://cse.campussource.de/ejb/LoggingManager"
+ portType="tns:LoggingManager"
+ inputVariable="DebugIn"/>
+
+
<empty name="loadContext">
<documentation>Load context for this entity for distribution (e.g. relations / parent objects / paths) and return it as xml (e.g. messages-object)</documentation>
</empty>
@@ -311,6 +344,18 @@
</sequence>
</scope>
</forEach>
- <empty name="finish"/>
+
+ <assign>
+ <copy>
+ <from>concat('Process finished (', $CseId, ')')</from>
+ <to>$DebugIn.parameters/message</to>
+ </copy>
+ </assign>
+
+ <invoke partnerLink="LoggingManager" operation="debug"
+ xmlns:tns="http://cse.campussource.de/ejb/LoggingManager"
+ portType="tns:LoggingManager"
+ inputVariable="DebugIn"/>
+
</sequence>
</process>
Copied: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/prepareUpdateAttributesCall.xsl (from rev 375, trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/toEntity.xsl)
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/prepareUpdateAttributesCall.xsl (rev 0)
+++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/prepareUpdateAttributesCall.xsl 2009-07-31 09:38:55 UTC (rev 410)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Document : toEntity.xsl.xsl
+ Created on : 24. Juli 2009, 11:24
+ Author : pete
+ Description:
+ Purpose of transformation follows.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:dt="http://cse.campussource.de/schema/DataTypes"
+ xmlns:em="http://cse.campussource.de/ejb/EntityManager"
+ xmlns="http://cse.campussource.de/schema/DataTypes"
+ 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="updateAttributes" namespace="http://cse.campussource.de/ejb/EntityManager">
+ <xsl:element name="entity" namespace="">
+ <xsl:copy-of select="//dt:busId"/>
+ <xsl:copy-of select="//dt:eventTime"/>
+ <xsl:copy-of select="//dt:attribute"/>
+ </xsl:element>
+ </xsl:element>
+ </xsl:template>
+
+</xsl:stylesheet>
Deleted: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/toEntity.xsl
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/toEntity.xsl 2009-07-30 18:17:08 UTC (rev 409)
+++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/toEntity.xsl 2009-07-31 09:38:55 UTC (rev 410)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Document : toEntity.xsl.xsl
- Created on : 24. Juli 2009, 11:24
- Author : pete
- Description:
- Purpose of transformation follows.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:dt="http://cse.campussource.de/schema/DataTypes"
- xmlns="http://cse.campussource.de/schema/DataTypes"
- 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="entity">
- <xsl:copy-of select="//dt:busId"/>
- <xsl:copy-of select="//dt:eventTime"/>
- <xsl:copy-of select="//dt:attribute"/>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|