Author: objectiser Date: 2010-09-07 12:53:58 -0400 (Tue, 07 Sep 2010) New Revision: 394 Modified: trunk/docs/gettingstartedguide/pom.xml trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml trunk/docs/gettingstartedguide/src/main/en-US/module/installation.xml trunk/docs/gettingstartedguide/src/main/en-US/module/runtimevalidation.xml trunk/docs/gettingstartedguide/src/main/en-US/module/serviceanalysisdesign.xml trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml trunk/docs/samplesguide/pom.xml trunk/docs/samplesguide/src/main/en-US/module/servicevalidator.xml trunk/docs/userguide/pom.xml trunk/docs/userguide/src/main/en-US/module/bpel.xml trunk/docs/userguide/src/main/en-US/module/conversation-validation.xml Log: Fixed documentation to include the images which were not included after switching to maven3. Modified: trunk/docs/gettingstartedguide/pom.xml =================================================================== --- trunk/docs/gettingstartedguide/pom.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/gettingstartedguide/pom.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -53,7 +53,7 @@ <imageResource> <directory>${basedir}/src/main</directory> <includes> - <include>images/**/*</include> + <include>**/images/**/*</include> </includes> </imageResource> <formats> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -104,7 +104,7 @@ </para> <imageobject> - <imagedata fileref="images/PurchaseGoods.jpg" align="center" width="5in" /> + <imagedata fileref="en-US/images/PurchaseGoods.jpg" align="center" width="5in" /> </imageobject> <section> @@ -120,7 +120,7 @@ </para> <imageobject> - <imagedata fileref="images/SuccessfulPurchasePostTest.jpg" align="center" width="5in" /> + <imagedata fileref="en-US/images/SuccessfulPurchasePostTest.jpg" align="center" width="5in" /> </imageobject> <para> @@ -131,7 +131,7 @@ </para> <imageobject> - <imagedata fileref="images/InvalidPurchasePostTest.jpg" align="center" width="5in" /> + <imagedata fileref="en-US/images/InvalidPurchasePostTest.jpg" align="center" width="5in" /> </imageobject> <para> @@ -166,7 +166,7 @@ </para> <imageobject> - <imagedata fileref="images/ExportHTMLMenu.png" align="center" width="4in" /> + <imagedata fileref="en-US/images/ExportHTMLMenu.png" align="center" width="4in" /> </imageobject> <para> @@ -175,7 +175,7 @@ </para> <imageobject> - <imagedata fileref="images/ExportHTMLDialog.png" align="center" width="4in" /> + <imagedata fileref="en-US/images/ExportHTMLDialog.png" align="center" width="4in" /> </imageobject> <para> @@ -186,7 +186,7 @@ </para> <imageobject> - <imagedata fileref="images/ExportedHTML.png" align="center" width="6in" /> + <imagedata fileref="en-US/images/ExportedHTML.png" align="center" width="6in" /> </imageobject> </section> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -23,7 +23,7 @@ </para> <imageobject> - <imagedata fileref="images/RolesAndRelationships.png" align="center" width="4in" /> + <imagedata fileref="en-US/images/RolesAndRelationships.png" align="center" width="4in" /> </imageobject> <para> @@ -32,7 +32,7 @@ </para> <imageobject> - <imagedata fileref="images/ParticipantAndOtherTypes.png" align="center" width="3in" /> + <imagedata fileref="en-US/images/ParticipantAndOtherTypes.png" align="center" width="3in" /> </imageobject> <para> @@ -64,7 +64,7 @@ </para> <imageobject> - <imagedata fileref="images/SuccessfulPurchasePreTest.jpg" align="center" width="5in" /> + <imagedata fileref="en-US/images/SuccessfulPurchasePreTest.jpg" align="center" width="5in" /> </imageobject> <para> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/installation.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/installation.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/installation.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -147,7 +147,7 @@ panal (Navigator or Package depending on perspective being viewed). </para> <imageobject> - <imagedata fileref="images/ImportMenu.jpg" align="center" width="2in" /> + <imagedata fileref="en-US/images/ImportMenu.jpg" align="center" width="2in" /> </imageobject> </listitem> <listitem> @@ -156,7 +156,7 @@ option and press the 'Next' button. </para> <imageobject> - <imagedata fileref="images/ImportDialog.jpg" align="center" width="4in" /> + <imagedata fileref="en-US/images/ImportDialog.jpg" align="center" width="4in" /> </imageobject> </listitem> <listitem> @@ -165,7 +165,7 @@ navigate to the <filename>${SAVARA-Tools}/samples</filename> folder, then press 'Ok'. </para> <imageobject> - <imagedata fileref="images/ImportFileDialog.jpg" align="center" width="3in" /> + <imagedata fileref="en-US/images/ImportFileDialog.jpg" align="center" width="3in" /> </imageobject> </listitem> <listitem> @@ -174,13 +174,13 @@ will be listed. Press the 'Finish' button to import them all. </para> <imageobject> - <imagedata fileref="images/ImportProjectsDialog.jpg" align="center" width="4in" /> + <imagedata fileref="en-US/images/ImportProjectsDialog.jpg" align="center" width="4in" /> </imageobject> <para> Once imported, the Eclipse navigator will list the sample projects: </para> <imageobject> - <imagedata fileref="images/ImportedProject.jpg" align="center" width="2in" /> + <imagedata fileref="en-US/images/ImportedProject.jpg" align="center" width="2in" /> </imageobject> </listitem> </orderedlist> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/runtimevalidation.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/runtimevalidation.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/runtimevalidation.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -38,7 +38,7 @@ </para> <imageobject> - <imagedata fileref="images/SVJBossESBEditAnnotation.jpg" align="center" width="3in" /> + <imagedata fileref="en-US/images/SVJBossESBEditAnnotation.jpg" align="center" width="3in" /> </imageobject> <para> @@ -48,7 +48,7 @@ </para> <imageobject> - <imagedata fileref="images/SVJBossESBAnnotation.jpg" align="center" width="3in" /> + <imagedata fileref="en-US/images/SVJBossESBAnnotation.jpg" align="center" width="3in" /> </imageobject> <para> @@ -56,7 +56,7 @@ </para> <imageobject> - <imagedata fileref="images/SVJBossESBAnnotationTooltip.jpg" align="center" width="3in" /> + <imagedata fileref="en-US/images/SVJBossESBAnnotationTooltip.jpg" align="center" width="3in" /> </imageobject> <para> @@ -147,7 +147,7 @@ </para> <imageobject> - <imagedata fileref="images/MonitorMenu.jpg" align="center" width="2in" /> + <imagedata fileref="en-US/images/MonitorMenu.jpg" align="center" width="2in" /> </imageobject> <para> @@ -156,7 +156,7 @@ </para> <imageobject> - <imagedata fileref="images/ChoreoMonReady.jpg" align="center" width="4in" /> + <imagedata fileref="en-US/images/ChoreoMonReady.jpg" align="center" width="4in" /> </imageobject> </section> @@ -172,7 +172,7 @@ </para> <imageobject> - <imagedata fileref="images/TrailblazerWebPage.jpg" align="center" width="4in" /> + <imagedata fileref="en-US/images/TrailblazerWebPage.jpg" align="center" width="4in" /> </imageobject> <para> @@ -212,7 +212,7 @@ </para> <imageobject> - <imagedata fileref="images/TrailBlazerMonitorError.jpg" align="center" width="4in" /> + <imagedata fileref="en-US/images/TrailBlazerMonitorError.jpg" align="center" width="4in" /> </imageobject> <para> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/serviceanalysisdesign.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/serviceanalysisdesign.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/serviceanalysisdesign.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -45,7 +45,7 @@ </para> <imageobject> - <imagedata fileref="images/ExportBPMNMenu.png" align="center" width="4in" /> + <imagedata fileref="en-US/images/ExportBPMNMenu.png" align="center" width="4in" /> </imageobject> <para> @@ -71,7 +71,7 @@ </para> <imageobject> - <imagedata fileref="images/ExportedBPMN.png" align="center" width="6in" /> + <imagedata fileref="en-US/images/ExportedBPMN.png" align="center" width="6in" /> </imageobject> </section> Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml =================================================================== --- trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -47,7 +47,7 @@ </para> <imageobject> - <imagedata fileref="images/GenerateBPELMenu.jpg" align="center" width="3in" /> + <imagedata fileref="en-US/images/GenerateBPELMenu.jpg" align="center" width="3in" /> </imageobject> <para> @@ -56,7 +56,7 @@ </para> <imageobject> - <imagedata fileref="images/GenerateBPELDialog.jpg" align="center" width="3in" /> + <imagedata fileref="en-US/images/GenerateBPELDialog.jpg" align="center" width="3in" /> </imageobject> <para> @@ -74,7 +74,7 @@ </para> <imageobject> - <imagedata fileref="images/GenerateBPELNav.jpg" align="center" width="2in" /> + <imagedata fileref="en-US/images/GenerateBPELNav.jpg" align="center" width="2in" /> </imageobject> </section> @@ -92,7 +92,8 @@ <informalexample> <programlisting role="XML" ><![CDATA[ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:ns1="http://www.jboss.org/examples/creditAgency"> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" + xmlns:ns1="http://www.jboss.org/examples/creditAgency"> <process name="ns1:PurchaseGoodsProcess_CreditAgency"> <active> true @@ -111,7 +112,7 @@ <informalexample> <programlisting role="XML" ><![CDATA[ - <service name="ns1:CreditAgencyService" port="CreditAgencyInterfacePort"/> +<service name="ns1:CreditAgencyService" port="CreditAgencyInterfacePort"/> ]]></programlisting> </informalexample> @@ -126,50 +127,49 @@ <informalexample> <programlisting role="XML" ><![CDATA[ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... - xmlns:ca="http://www.jboss.org/examples/creditAgency" - xmlns:pur="http://www.jboss.org/examples/purchasing" - xmlns:sto="http://www.jboss.org/examples/store" - xmlns:tns="http://www.jboss.org/savara/examples" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:ns0="http://www.scribble.org/conversation" - ns0:conversationType="savara.samples.Common@CreditAgency" - name="PurchaseGoodsProcess_CreditAgency" - targetNamespace="http://www.jboss.org/examples/creditAgency" - xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... - <import importType="http://schemas.xmlsoap.org/wsdl/" - location="PurchaseGoodsProcess_CreditAgency.wsdl" - namespace="http://www.jboss.org/examples/creditAgency"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" - location="PurchaseGoodsProcess_Store.wsdl" - namespace="http://www.jboss.org/examples/store"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" - location="CreditAgencyPartnerLinkTypes.wsdl" - namespace="http://www.jboss.org/examples/creditAgency"/> - <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" - partnerLinkType="ca:StoreToCreditAgencyServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="ca:CreditCheckRequest" name="creditCheckRequestVar"/> - <variable messageType="ca:CreditCheckOk" name="creditCheckOkVar"/> - <variable messageType="ca:CreditCheckInvalid" name="creditCheckInvalidVar"/> - </variables> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... + xmlns:ca="http://www.jboss.org/examples/creditAgency" + xmlns:sto="http://www.jboss.org/examples/store" + xmlns:tns="http://www.jboss.org/savara/examples" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:ns0="http://www.scribble.org/conversation" + ns0:conversationType="savara.samples.Common@CreditAgency" + name="PurchaseGoodsProcess_CreditAgency" + targetNamespace="http://www.jboss.org/examples/creditAgency" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... + <import importType="http://schemas.xmlsoap.org/wsdl/" + location="PurchaseGoodsProcess_CreditAgency.wsdl" + namespace="http://www.jboss.org/examples/creditAgency"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" + location="PurchaseGoodsProcess_Store.wsdl" + namespace="http://www.jboss.org/examples/store"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" + location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" + namespace="http://www.jboss.org/examples/creditAgency"/> + <partnerLinks> + <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" + partnerLinkType="ca:StoreToCreditAgencyServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="ca:checkCreditRequest" name="creditCheckRequestVar"/> + <variable messageType="ca:checkCreditResponse" name="creditCheckOkVar"/> + <variable messageType="ca:CreditCheckFailedFault" name="creditCheckInvalidVar"/> + </variables> <sequence> - <receive createInstance="yes" operation="checkCredit" - partnerLink="StoreToCreditAgency" portType="ca:CreditAgencyInterface" - variable="creditCheckRequestVar"/> + <receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" + partnerLink="StoreToCreditAgency" portType="ca:CreditAgencyInterface" + variable="creditCheckRequestVar"/> <if> <sequence> - <reply operation="checkCredit" partnerLink="StoreToCreditAgency" - portType="ca:CreditAgencyInterface" variable="creditCheckOkVar"/> + <reply name="Send_CreditCheckOk" operation="checkCredit" + partnerLink="StoreToCreditAgency" + portType="ca:CreditAgencyInterface" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="ca:CreditCheckFailed" operation="checkCredit" - partnerLink="StoreToCreditAgency" - portType="ca:CreditAgencyInterface" - variable="creditCheckInvalidVar"/> + <reply faultName="ca:CreditCheckFailed" name="Send_CreditCheckInvalid" + operation="checkCredit" partnerLink="StoreToCreditAgency" + portType="ca:CreditAgencyInterface" variable="creditCheckInvalidVar"/> </sequence> </else> </if> @@ -185,11 +185,11 @@ <informalexample> <programlisting role="XML" ><![CDATA[ - <if> - <condition> - $creditCheckRequestVar.CreditCheckRequest/pur:amount &lt;= 500 - </condition> - .... +<if> + <bpel:condition> + $creditCheckRequestVar.content/@amount <= 500 + </bpel:condition> + .... ]]></programlisting> </informalexample> @@ -209,12 +209,24 @@ <informalexample> <programlisting role="XML" ><![CDATA[ - <assign name="CopyPurchaseDetails"> - <copy> - <from>$creditCheckRequestVar.CreditCheckRequest</from> - <to>$creditCheckOkVar.CreditCheckOk</to> - </copy> - </assign> +<assign name="CopyPurchaseDetails"> + <bpel:copy> + <bpel:from> + <bpel:literal xml:space="preserve"> + <tns:CreditCheckOk xmlns:tns="http://www.jboss.org/examples/creditAgency" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/examples/creditAgency creditAgency.xsd " + id="" amount="" > + </tns:CreditCheckOk> + </bpel:literal> + </bpel:from> + <bpel:to variable="creditCheckOkVar" part="content"></bpel:to> + </bpel:copy> + <copy> + <from>$creditCheckRequestVar.content/@id</from> + <to>$creditCheckOkVar.content/@id</to> + </copy> +</assign> ]]></programlisting> </informalexample> @@ -226,12 +238,24 @@ <informalexample> <programlisting role="XML" ><![CDATA[ - <assign name="CopyPurchaseDetails"> - <copy> - <from>$creditCheckRequestVar.CreditCheckRequest</from> - <to>$creditCheckInvalidVar.CreditCheckInvalid</to> - </copy> - </assign> +<assign name="CopyPurchaseDetails"> + <bpel:copy> + <bpel:from> + <bpel:literal xml:space="preserve"> + <tns:CreditCheckInvalid xmlns:tns="http://www.jboss.org/examples/creditAgency" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/examples/creditAgency creditAgency.xsd " + id="" amount="" > + </tns:CreditCheckInvalid> + </bpel:literal> + </bpel:from> + <bpel:to variable="creditCheckInvalidVar" part="content"></bpel:to> + </bpel:copy> + <copy> + <from>$creditCheckRequestVar.content/@id</from> + <to>$creditCheckInvalidVar.content/@id</to> + </copy> +</assign> ]]></programlisting> </informalexample> @@ -251,7 +275,8 @@ <informalexample> <programlisting role="XML" ><![CDATA[ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:ns1="http://www.jboss.org/examples/store"> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" + xmlns:ns1="http://www.jboss.org/examples/store"> <process name="ns1:PurchaseGoodsProcess_Store"> <active> true @@ -273,7 +298,7 @@ <informalexample> <programlisting role="XML" ><![CDATA[ - xmlns:ns2="http://www.jboss.org/examples/creditAgency" +xmlns:ns2="http://www.jboss.org/examples/creditAgency" ]]></programlisting> </informalexample> @@ -304,59 +329,58 @@ <informalexample> <programlisting role="XML" ><![CDATA[ <process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... - xmlns:ca="http://www.jboss.org/examples/creditAgency" - xmlns:pur="http://www.jboss.org/examples/purchasing" - xmlns:sto="http://www.jboss.org/examples/store" - xmlns:tns="http://www.jboss.org/savara/examples" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:ns0="http://www.scribble.org/conversation" - ns0:conversationType="savara.samples.Purchasing@Store" - name="PurchaseGoodsProcess_Store" - targetNamespace="http://www.jboss.org/examples/store" - xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... + xmlns:ca="http://www.jboss.org/examples/creditAgency" + xmlns:sto="http://www.jboss.org/examples/store" + xmlns:tns="http://www.jboss.org/savara/examples" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:ns0="http://www.scribble.org/conversation" + ns0:conversationType="savara.samples.Purchasing@Store" + name="PurchaseGoodsProcess_Store" + targetNamespace="http://www.jboss.org/examples/store" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... <import importType="http://schemas.xmlsoap.org/wsdl/" - location="PurchaseGoodsProcess_Store.wsdl" - namespace="http://www.jboss.org/examples/store"/> + location="PurchaseGoodsProcess_Store.wsdl" + namespace="http://www.jboss.org/examples/store"/> <import importType="http://schemas.xmlsoap.org/wsdl/" - location="PurchaseGoodsProcess_CreditAgency.wsdl" - namespace="http://www.jboss.org/examples/creditAgency"/> + location="PurchaseGoodsProcess_CreditAgency.wsdl" + namespace="http://www.jboss.org/examples/creditAgency"/> <import importType="http://schemas.xmlsoap.org/wsdl/" - location="StorePartnerLinkTypes.wsdl" - namespace="http://www.jboss.org/examples/store"/> + location="PurchaseGoodsProcess_StoreArtifacts.wsdl" + namespace="http://www.jboss.org/examples/store"/> <partnerLinks> - <partnerLink myRole="StoreService" name="BuyerToStore" - partnerLinkType="sto:BuyerToStoreServiceLT"/> - <partnerLink name="StoreToCreditAgency" - partnerLinkType="sto:StoreToCreditAgencyLT" - partnerRole="CreditAgencyRequester"/> + <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/> + <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" + partnerRole="CreditAgencyRequester"/> </partnerLinks> <variables> - <variable messageType="sto:BuyRequest" name="buyRequestVar"/> - <variable messageType="ca:CreditCheckRequest" name="creditCheckRequestVar"/> - <variable messageType="ca:CreditCheckOk" name="creditCheckOkVar"/> - <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/> - <variable messageType="sto:BuyFailed" name="buyFailedVar"/> + <variable messageType="sto:buyRequest" name="buyRequestVar"/> + <variable messageType="ca:checkCreditRequest" name="creditCheckRequestVar"/> + <variable messageType="ca:checkCreditResponse" name="creditCheckOkVar"/> + <variable messageType="sto:buyResponse" name="buyConfirmedVar"/> + <variable messageType="sto:BuyFailedFault" name="buyFailedVar"/> </variables> <sequence> - <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" + <receive createInstance="yes" name="Receive_BuyRequest" operation="buy" + partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/> <scope> <faultHandlers> - <catch faultMessageType="ca:CreditCheckInvalid" - faultName="ca:CreditCheckFailed" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="ca:CreditCheckFailedFault" + faultName="ca:CreditCheckFailed" + faultVariable="creditCheckInvalidVar"> <sequence> - <reply faultName="sto:BuyFailed" operation="buy" - partnerLink="BuyerToStore" portType="sto:StoreInterface" - variable="buyFailedVar"/> + <reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" + partnerLink="BuyerToStore" portType="sto:StoreInterface" + variable="buyFailedVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" - outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" - portType="ca:CreditAgencyInterface"/> - <reply operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" - variable="buyConfirmedVar"/> + <invoke inputVariable="creditCheckRequestVar" name="Send_CreditCheckRequest" + operation="checkCredit" outputVariable="creditCheckOkVar" + partnerLink="StoreToCreditAgency" portType="ca:CreditAgencyInterface"/> + <reply name="Send_BuyConfirmed" operation="buy" partnerLink="BuyerToStore" + portType="sto:StoreInterface" variable="buyConfirmedVar"/> </sequence> </scope> </sequence> @@ -372,12 +396,23 @@ <informalexample> <programlisting role="XML" ><![CDATA[ - <assign name="CopyPurchaseDetails"> - <copy> - <from>$creditCheckInvalidVar.CreditCheckInvalid</from> - <to>$buyFailedVar.BuyFailed</to> - </copy> - </assign> +<assign name="CopyPurchaseDetails"> + <bpel:copy> + <bpel:from> + <bpel:literal xml:space="preserve"> + <tns:BuyFailed xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:tns="http://www.jboss.org/examples/store" + xsi:schemaLocation="http://www.jboss.org/examples/store store.xsd " + id="" /> + </bpel:literal> + </bpel:from> + <bpel:to variable="buyFailedVar" part="content"></bpel:to> + </bpel:copy> + <copy> + <from>$creditCheckInvalidVar.content/@id</from> + <to>$buyFailedVar.content/@id</to> + </copy> +</assign> ]]></programlisting> </informalexample> @@ -392,21 +427,48 @@ <informalexample> <programlisting role="XML" ><![CDATA[ - <assign name="CopyPurchaseDetails"> - <copy> - <from>$buyRequestVar.BuyRequest</from> - <to>$creditCheckRequestVar.CreditCheckRequest</to> - </copy> - </assign> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" - outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" - portType="ca:CreditAgencyInterface"/> - <assign name="CopyPurchaseDetails"> - <copy> - <from>$creditCheckOkVar.CreditCheckOk</from> - <to>$buyConfirmedVar.BuyConfirmed</to> - </copy> - </assign> +<assign name="CopyPurchaseDetails"> + <bpel:copy> + <bpel:from> + <bpel:literal xml:space="preserve"> + <tns:CreditCheckRequest xmlns:tns="http://www.jboss.org/examples/creditAgency" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/examples/creditAgency creditAgency.xsd " + id="" amount="" > + </tns:CreditCheckRequest> + </bpel:literal> + </bpel:from> + <bpel:to variable="creditCheckRequestVar" part="content"></bpel:to> + </bpel:copy> + <copy> + <from>$buyRequestVar.content/@id</from> + <to>$creditCheckRequestVar.content/@id</to> + </copy> + <copy> + <from>$buyRequestVar.content/@amount</from> + <to>$creditCheckRequestVar.content/@amount</to> + </copy> +</assign> +<invoke inputVariable="creditCheckRequestVar" name="Send_CreditCheckRequest" + operation="checkCredit" outputVariable="creditCheckOkVar" + partnerLink="StoreToCreditAgency" portType="ca:CreditAgencyInterface"/> +<assign name="CopyPurchaseDetails"> + <bpel:copy> + <bpel:from> + <bpel:literal xml:space="preserve"> + <tns:BuyConfirmed xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:tns="http://www.jboss.org/examples/store" + xsi:schemaLocation="http://www.jboss.org/examples/store store.xsd " + id="" /> + </bpel:literal> + </bpel:from> + <bpel:to variable="buyConfirmedVar" part="content"></bpel:to> + </bpel:copy> + <copy> + <from>$creditCheckOkVar.content/@id</from> + <to>$buyConfirmedVar.content/@id</to> + </copy> +</assign> ]]></programlisting> </informalexample> Modified: trunk/docs/samplesguide/pom.xml =================================================================== --- trunk/docs/samplesguide/pom.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/samplesguide/pom.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -53,7 +53,7 @@ <imageResource> <directory>${basedir}/src/main</directory> <includes> - <include>images/**/*</include> + <include>**/images/**/*</include> </includes> </imageResource> <formats> Modified: trunk/docs/samplesguide/src/main/en-US/module/servicevalidator.xml =================================================================== --- trunk/docs/samplesguide/src/main/en-US/module/servicevalidator.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/samplesguide/src/main/en-US/module/servicevalidator.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -80,7 +80,7 @@ </para> <imageobject> - <imagedata fileref="images/MonitorMenu.jpg" align="center" width="2in" /> + <imagedata fileref="en-US/images/MonitorMenu.jpg" align="center" width="2in" /> </imageobject> <para> @@ -89,7 +89,7 @@ </para> <imageobject> - <imagedata fileref="images/ChoreoMonReady.jpg" align="center" width="4in" /> + <imagedata fileref="en-US/images/ChoreoMonReady.jpg" align="center" width="4in" /> </imageobject> </listitem> @@ -100,7 +100,7 @@ </para> <imageobject> - <imagedata fileref="images/TrailblazerWebPage.jpg" align="center" width="4in" /> + <imagedata fileref="en-US/images/TrailblazerWebPage.jpg" align="center" width="4in" /> </imageobject> </listitem> Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/userguide/pom.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -53,7 +53,7 @@ <imageResource> <directory>${basedir}/src/main</directory> <includes> - <include>images/**/*</include> + <include>**/images/**/*</include> </includes> </imageResource> <formats> Modified: trunk/docs/userguide/src/main/en-US/module/bpel.xml =================================================================== --- trunk/docs/userguide/src/main/en-US/module/bpel.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/userguide/src/main/en-US/module/bpel.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -35,7 +35,7 @@ </para> <imageobject> - <imagedata fileref="images/genbpel1.png" width="4in" /> + <imagedata fileref="en-US/images/genbpel1.png" width="4in" /> </imageobject> <para> @@ -45,7 +45,7 @@ </para> <imageobject> - <imagedata fileref="images/genbpel2.png" width="4in" /> + <imagedata fileref="en-US/images/genbpel2.png" width="4in" /> </imageobject> <para> @@ -61,7 +61,7 @@ </para> <imageobject> - <imagedata fileref="images/genbpel3.png" width="4in" /> + <imagedata fileref="en-US/images/genbpel3.png" width="4in" /> </imageobject> </section> Modified: trunk/docs/userguide/src/main/en-US/module/conversation-validation.xml =================================================================== --- trunk/docs/userguide/src/main/en-US/module/conversation-validation.xml 2010-09-07 12:53:47 UTC (rev 393) +++ trunk/docs/userguide/src/main/en-US/module/conversation-validation.xml 2010-09-07 16:53:58 UTC (rev 394) @@ -130,7 +130,7 @@ </para> <imageobject> - <imagedata fileref="images/editvalidatorann.png" width="5in" /> + <imagedata fileref="en-US/images/editvalidatorann.png" width="5in" /> </imageobject> <para> @@ -141,7 +141,7 @@ </para> <imageobject> - <imagedata fileref="images/editvalidatoranndiag.png" width="5in" /> + <imagedata fileref="en-US/images/editvalidatoranndiag.png" width="5in" /> </imageobject> <para> @@ -150,7 +150,7 @@ </para> <imageobject> - <imagedata fileref="images/editvalidatorannselect.png" width="3in" /> + <imagedata fileref="en-US/images/editvalidatorannselect.png" width="3in" /> </imageobject> <para> @@ -160,7 +160,7 @@ </para> <imageobject> - <imagedata fileref="images/validatorannotation.png" width="5in" /> + <imagedata fileref="en-US/images/validatorannotation.png" width="5in" /> </imageobject> <para> @@ -226,7 +226,7 @@ </para> <imageobject> - <imagedata fileref="images/monitorui.png" width="5in" /> + <imagedata fileref="en-US/images/monitorui.png" width="5in" /> </imageobject> <para>