1.1 --- a/bpel.mapper/src/org/netbeans/modules/bpel/mapper/model/BpelChangeProcessor.java Fri Apr 04 12:08:27 2008 +0400
1.2 +++ b/bpel.mapper/src/org/netbeans/modules/bpel/mapper/model/BpelChangeProcessor.java Fri Apr 04 12:11:04 2008 +0400
1.3 @@ -22,6 +22,11 @@
1.4 import java.util.concurrent.Callable;
1.5 import javax.swing.tree.TreePath;
1.6 import org.netbeans.modules.bpel.model.api.BpelModel;
1.7 +import org.netbeans.modules.bpel.model.api.Process;
1.8 +import org.netbeans.modules.bpel.model.ext.editor.api.Editor;
1.9 +import org.netbeans.modules.bpel.model.ext.logging.api.Trace;
1.10 +import org.netbeans.modules.xml.xpath.ext.schema.ExNamespaceContext;
1.11 +import org.netbeans.modules.xml.xpath.ext.schema.InvalidNamespaceException;
1.12 import org.openide.ErrorManager;
1.13
1.14 /**
1.15 @@ -47,6 +52,9 @@
1.16 if (bpelModel == null) {
1.17 return;
1.18 }
1.19 +
1.20 + processRegisterExtensions(bpelModel);
1.21 +
1.22 bpelModel.invoke(new Callable<Object>() {
1.23 public Object call() throws Exception {
1.24 mBpelModelUpdater.updateOnChanges(graphTreePath);
1.25 @@ -58,12 +66,49 @@
1.26 }
1.27 }
1.28
1.29 + //workaround to fix unsync with source
1.30 + private void processRegisterExtensions(final BpelModel bpelModel) {
1.31 + try {
1.32 + if (bpelModel == null) {
1.33 + return;
1.34 + }
1.35 +
1.36 + bpelModel.invoke(new Callable<Object>() {
1.37 + public Object call() throws Exception {
1.38 + registerExtensions(bpelModel);
1.39 + return null;
1.40 + }
1.41 + }, mChangeSource);
1.42 +
1.43 + bpelModel.sync();
1.44 + } catch (Exception ex) {
1.45 + ErrorManager.getDefault().notify(ex);
1.46 + }
1.47 + }
1.48 +
1.49 + private void registerExtensions(BpelModel bpelModel) throws InvalidNamespaceException {
1.50 + Process process = bpelModel == null ? null : bpelModel.getProcess();
1.51 + if (process == null) {
1.52 + return;
1.53 + }
1.54 +
1.55 + ExNamespaceContext nsContext = process.getNamespaceContext();
1.56 + if (nsContext == null) {
1.57 + return;
1.58 + }
1.59 + nsContext.addNamespace(Trace.LOGGING_NAMESPACE_URI);
1.60 + nsContext.addNamespace(Editor.EDITOR_NAMESPACE_URI);
1.61 + }
1.62 +
1.63 public void processChanges(final Collection<TreePath> graphTreePathList) {
1.64 try {
1.65 BpelModel bpelModel = getBpelModel();
1.66 if (bpelModel == null) {
1.67 return;
1.68 }
1.69 +
1.70 + processRegisterExtensions(bpelModel);
1.71 +
1.72 bpelModel.invoke(new Callable<Object>() {
1.73 public Object call() throws Exception {
1.74 for (TreePath graphTreePath : graphTreePathList) {
2.1 --- a/bpel.samples/resources/AsynchronousSample/AsynchronousSample/src/AsynchronousSample.bpel Fri Apr 04 12:08:27 2008 +0400
2.2 +++ b/bpel.samples/resources/AsynchronousSample/AsynchronousSample/src/AsynchronousSample.bpel Fri Apr 04 12:11:04 2008 +0400
2.3 @@ -33,6 +33,8 @@
2.4 xmlns:wsdlNS="http://enterprise.netbeans.org/bpel/AsynchronousSample"
2.5 xmlns:xs="http://enterprise.netbeans.org/bpel/AsynchronousSampleSchemaNamespace"
2.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
2.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
2.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
2.9 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
2.10 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
2.11
3.1 --- a/bpel.samples/resources/AsynchronousSample/AsynchronousSample/src/AsynchronousSampleClient.bpel Fri Apr 04 12:08:27 2008 +0400
3.2 +++ b/bpel.samples/resources/AsynchronousSample/AsynchronousSample/src/AsynchronousSampleClient.bpel Fri Apr 04 12:11:04 2008 +0400
3.3 @@ -34,6 +34,8 @@
3.4 xmlns:wsdlNS="http://enterprise.netbeans.org/bpel/AsynchronousSampleClient"
3.5 xmlns:xs="http://enterprise.netbeans.org/bpel/AsynchronousSampleClient"
3.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
3.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
3.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
3.9 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
3.10 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
3.11
4.1 --- a/bpel.samples/resources/BluePrint1/BluePrint1/src/InventoryService.bpel Fri Apr 04 12:08:27 2008 +0400
4.2 +++ b/bpel.samples/resources/BluePrint1/BluePrint1/src/InventoryService.bpel Fri Apr 04 12:11:04 2008 +0400
4.3 @@ -33,6 +33,8 @@
4.4 xmlns:tns="http://www.seebeyond.com/eInsight/newuntitled"
4.5 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
4.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
4.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
4.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
4.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp1"
4.10 xmlns:invsh="http://manufacturing.org/xsd/inventory"
4.11 xmlns:po="http://manufacturing.org/xsd/purchase">
5.1 --- a/bpel.samples/resources/BluePrint1/BluePrint1/src/POService.bpel Fri Apr 04 12:08:27 2008 +0400
5.2 +++ b/bpel.samples/resources/BluePrint1/BluePrint1/src/POService.bpel Fri Apr 04 12:11:04 2008 +0400
5.3 @@ -32,6 +32,8 @@
5.4 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
5.5 xmlns:pos="http://manufacturing.org/wsdl/purchase/bp1"
5.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
5.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
5.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
5.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp1"
5.10 targetNamespace="http://manufacturing.org/wsdl/purchase/bp1"
5.11 xmlns:inv="http://manufacturing.org/xsd/inventory"
6.1 --- a/bpel.samples/resources/BluePrint2/BluePrint2/src/InventoryService.bpel Fri Apr 04 12:08:27 2008 +0400
6.2 +++ b/bpel.samples/resources/BluePrint2/BluePrint2/src/InventoryService.bpel Fri Apr 04 12:11:04 2008 +0400
6.3 @@ -32,6 +32,8 @@
6.4 targetNamespace="http://manufacturing.org/wsdl/inventory/bp2"
6.5 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
6.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
6.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
6.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
6.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp2"
6.10 xmlns:invsh="http://manufacturing.org/xsd/inventory"
6.11 xmlns:po="http://manufacturing.org/xsd/purchase">
7.1 --- a/bpel.samples/resources/BluePrint2/BluePrint2/src/POService.bpel Fri Apr 04 12:08:27 2008 +0400
7.2 +++ b/bpel.samples/resources/BluePrint2/BluePrint2/src/POService.bpel Fri Apr 04 12:11:04 2008 +0400
7.3 @@ -32,6 +32,8 @@
7.4 targetNamespace="http://manufacturing.org/wsdl/purchase/bp2"
7.5 xmlns:pos="http://manufacturing.org/wsdl/purchase/bp2"
7.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
7.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
7.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
7.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp2"
7.10 xmlns:invsh="http://manufacturing.org/xsd/inventory"
7.11 xmlns:po="http://manufacturing.org/xsd/purchase">
8.1 --- a/bpel.samples/resources/BluePrint3/BluePrint3/src/InventoryService.bpel Fri Apr 04 12:08:27 2008 +0400
8.2 +++ b/bpel.samples/resources/BluePrint3/BluePrint3/src/InventoryService.bpel Fri Apr 04 12:11:04 2008 +0400
8.3 @@ -33,6 +33,8 @@
8.4 xmlns:tns="http://www.seebeyond.com/eInsight/newuntitled"
8.5 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
8.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
8.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
8.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
8.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp3"
8.10 xmlns:invsh="http://manufacturing.org/xsd/inventory"
8.11 xmlns:po="http://manufacturing.org/xsd/purchase">
9.1 --- a/bpel.samples/resources/BluePrint3/BluePrint3/src/POService.bpel Fri Apr 04 12:08:27 2008 +0400
9.2 +++ b/bpel.samples/resources/BluePrint3/BluePrint3/src/POService.bpel Fri Apr 04 12:11:04 2008 +0400
9.3 @@ -34,6 +34,8 @@
9.4 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
9.5 xmlns:pos="http://manufacturing.org/wsdl/purchase/bp3"
9.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
9.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
9.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
9.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp3"
9.10 xmlns:po="http://manufacturing.org/xsd/purchase">
9.11
10.1 --- a/bpel.samples/resources/BluePrint4/BluePrint4/src/InventoryService.bpel Fri Apr 04 12:08:27 2008 +0400
10.2 +++ b/bpel.samples/resources/BluePrint4/BluePrint4/src/InventoryService.bpel Fri Apr 04 12:11:04 2008 +0400
10.3 @@ -33,6 +33,8 @@
10.4 xmlns:tns="http://www.seebeyond.com/eInsight/inventoryservice/bp4"
10.5 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
10.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
10.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
10.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
10.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp4"
10.10 xmlns:ns0="http://manufacturing.org/xsd/inventory"
10.11 xmlns:ns1="http://manufacturing.org/xsd/purchase">
11.1 --- a/bpel.samples/resources/BluePrint4/BluePrint4/src/POService.bpel Fri Apr 04 12:08:27 2008 +0400
11.2 +++ b/bpel.samples/resources/BluePrint4/BluePrint4/src/POService.bpel Fri Apr 04 12:11:04 2008 +0400
11.3 @@ -35,6 +35,8 @@
11.4 xmlns:ns0="http://localhost/wsdl/purchase/PurchaseOrderStatus/bp4"
11.5 xmlns:pos="http://manufacturing.org/wsdl/purchase/bp4"
11.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
11.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
11.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
11.9 xmlns:invs="http://manufacturing.org/wsdl/inventory/bp4"
11.10 xmlns:ns1="http://manufacturing.org/xsd/inventory"
11.11 xmlns:ns2="http://manufacturing.org/xsd/purchase">
12.1 --- a/bpel.samples/resources/BluePrint5/BluePrint5/src/ReservationSystem.bpel Fri Apr 04 12:08:27 2008 +0400
12.2 +++ b/bpel.samples/resources/BluePrint5/BluePrint5/src/ReservationSystem.bpel Fri Apr 04 12:11:04 2008 +0400
12.3 @@ -35,6 +35,8 @@
12.4 xmlns:ns0="http://localhost/BluePrint5/Reservation"
12.5 xmlns:ns1="http://localhost/BluePrint5/AirLineReservation"
12.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
12.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
12.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
12.9 xmlns:ns3="http://localhost/BluePrint5/HotelReservation"
12.10 xmlns:ns2="http://localhost/BluePrint5/CarReservation"
12.11 xmlns:rsrv="http://ReservationSystem.org/xsd/reserve">
13.1 --- a/bpel.samples/resources/BluePrint5/BluePrint5/src/airLineReservation.bpel Fri Apr 04 12:08:27 2008 +0400
13.2 +++ b/bpel.samples/resources/BluePrint5/BluePrint5/src/airLineReservation.bpel Fri Apr 04 12:11:04 2008 +0400
13.3 @@ -33,6 +33,8 @@
13.4 xmlns:tns="http://www.seebeyond.com/eInsight/airLineReservation"
13.5 xmlns:ns0="http://localhost/BluePrint5/AirLineReservation"
13.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
13.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
13.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
13.9 xmlns:rsrv="http://ReservationSystem.org/xsd/reserve">
13.10
13.11 <import namespace="http://localhost/BluePrint5/AirLineReservation"
14.1 --- a/bpel.samples/resources/BluePrint5/BluePrint5/src/carReservation.bpel Fri Apr 04 12:08:27 2008 +0400
14.2 +++ b/bpel.samples/resources/BluePrint5/BluePrint5/src/carReservation.bpel Fri Apr 04 12:11:04 2008 +0400
14.3 @@ -34,6 +34,8 @@
14.4 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
14.5 xmlns:ns0="http://localhost/BluePrint5/CarReservation"
14.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
14.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
14.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
14.9 xmlns:rsrv="http://ReservationSystem.org/xsd/reserve">
14.10
14.11 <import namespace="http://localhost/BluePrint5/CarReservation"
15.1 --- a/bpel.samples/resources/BluePrint5/BluePrint5/src/hotelReservation.bpel Fri Apr 04 12:08:27 2008 +0400
15.2 +++ b/bpel.samples/resources/BluePrint5/BluePrint5/src/hotelReservation.bpel Fri Apr 04 12:11:04 2008 +0400
15.3 @@ -34,6 +34,8 @@
15.4 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
15.5 xmlns:ns0="http://localhost/BluePrint5/HotelReservation"
15.6 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
15.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
15.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
15.9 xmlns:rsrv="http://ReservationSystem.org/xsd/reserve">
15.10
15.11 <import namespace="http://localhost/BluePrint5/HotelReservation"
16.1 --- a/bpel.samples/resources/SynchronousSample/SynchronousSample/src/SynchronousSample.bpel Fri Apr 04 12:08:27 2008 +0400
16.2 +++ b/bpel.samples/resources/SynchronousSample/SynchronousSample/src/SynchronousSample.bpel Fri Apr 04 12:11:04 2008 +0400
16.3 @@ -33,6 +33,8 @@
16.4 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
16.5 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
16.6 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
16.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
16.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
16.9 xmlns:wsdlNS="http://enterprise.netbeans.org/bpel/SynchronousSample/SynchronousSample_1"
16.10 xmlns:ns1="http://localhost/SynchronousSample/SynchronousSample"
16.11 xmlns:ns2="http://xml.netbeans.org/schema/SynchronousSample">
17.1 --- a/bpel.samples/resources/TravelReservationService/TravelReservationService/src/TravelReservationService.bpel Fri Apr 04 12:08:27 2008 +0400
17.2 +++ b/bpel.samples/resources/TravelReservationService/TravelReservationService/src/TravelReservationService.bpel Fri Apr 04 12:11:04 2008 +0400
17.3 @@ -33,6 +33,8 @@
17.4 xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
17.5 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
17.6 xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
17.7 + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace"
17.8 + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
17.9 xmlns:tns="tres" xmlns:tres="http://www.sun.com/javaone/05/TravelReservationService"
17.10 xmlns:ares="http://www.sun.com/javaone/05/AirlineReservationService"
17.11 xmlns:vres="http://www.sun.com/javaone/05/VehicleReservationService"