From 708d501cc49c7d2fd702ae450988b5596b675741 Mon Sep 17 00:00:00 2001 From: "KLG\\tdradmin" Date: Fri, 13 Dec 2024 12:00:06 +0100 Subject: [PATCH 1/2] First deployable concept --- Components/Components.csproj | 3 +- Components/Properties/AssemblyInfo.cs | 4 +- Deployment/Deployment.btdfproj | 61 +++++++++++++++--- Deployment/EnvironmentSettings/DEV.xml | 39 +++++++++++ .../Exported_DevSettings.xml | 16 +++++ .../Exported_LocalSettings.xml | 16 +++++ .../Exported_ProdSettings.xml | 16 +++++ .../Exported_TestSettings.xml | 16 +++++ Deployment/PortBindings.xml | 32 ++++----- Deployment/PortBindingsMaster.xml | 24 +++---- PipelineComponents/PipelineComponents.csproj | 3 +- PipelineComponents/Properties/AssemblyInfo.cs | 4 +- Pipelines/Properties/AssemblyInfo.cs | 4 +- Pipelines/Shipments.XMLReceive.btp.cs | 34 +++++----- Schemas/Properties/AssemblyInfo.cs | 4 +- TransSmart.sln | 4 +- Transforms/CustomExtensions.xml | Bin 3840 -> 3840 bytes Transforms/Properties/AssemblyInfo.cs | 4 +- ...ed.OrderStatus_to_TM.TransSmart.Status.btm | Bin 2086 -> 2086 bytes ...OrderStatus_to_TM.TransSmart.Status.btm.cs | 10 +-- ...TransSmart.Shipment_to_TM.Shared.Order.btm | Bin 2020 -> 2076 bytes ...nsSmart.Shipment_to_TM.Shared.Order.btm.cs | 10 +-- 22 files changed, 225 insertions(+), 79 deletions(-) create mode 100644 Deployment/EnvironmentSettings/DEV.xml create mode 100644 Deployment/EnvironmentSettings/Exported_DevSettings.xml create mode 100644 Deployment/EnvironmentSettings/Exported_LocalSettings.xml create mode 100644 Deployment/EnvironmentSettings/Exported_ProdSettings.xml create mode 100644 Deployment/EnvironmentSettings/Exported_TestSettings.xml diff --git a/Components/Components.csproj b/Components/Components.csproj index 0d40f5d..7bf76a5 100644 --- a/Components/Components.csproj +++ b/Components/Components.csproj @@ -9,8 +9,9 @@ Properties TM.TransSmart.Components TM.TransSmart.Components - v4.5 + v4.6 512 + true diff --git a/Components/Properties/AssemblyInfo.cs b/Components/Properties/AssemblyInfo.cs index bc09faf..ab0da84 100644 --- a/Components/Properties/AssemblyInfo.cs +++ b/Components/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("3.0.1.0")] +[assembly: AssemblyFileVersion("3.0.1.0")] diff --git a/Deployment/Deployment.btdfproj b/Deployment/Deployment.btdfproj index f64ab6f..7644d2f 100644 --- a/Deployment/Deployment.btdfproj +++ b/Deployment/Deployment.btdfproj @@ -16,7 +16,7 @@ KLG\BizTalk SSO Administrators_$(BTDFENV) 1.0 - TM.TransSmart + KLG.Extern 1.0 True True @@ -56,7 +56,7 @@ - 1.0.33 + 3.0.33 6c62c5e2-4df2-4daf-b556-9a4d9bdea470 TM.TransSmart @@ -89,15 +89,12 @@ - - - - + - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Deployment/EnvironmentSettings/DEV.xml b/Deployment/EnvironmentSettings/DEV.xml new file mode 100644 index 0000000..7026646 --- /dev/null +++ b/Deployment/EnvironmentSettings/DEV.xml @@ -0,0 +1,39 @@ + + + + D:\ESB\KLG.TM\TransSmart\From\Shipments\*.xml + D:\ESB\KLG.TM\TransSmart\From\OrderStatus\%MessageID%.xml + D:\ESB\KLG.TM\TransSmart\To\OrderStatus\%MessageID%.xml + KLG\BizTalk SSO Administrators_DEV + KLG\BizTalk SSO Administrators_DEV + Data Source=NLDC1-BTSSQLE01;Initial Catalog=ESBTrackingDEV;Integrated Security=SSPI; + Provider=SQLOLEDB.1;Data Source=vmBizTalkTST\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI; + + + Provider=SQLOLEDB.1;Data Source=VMSQL1VENLO\Others;Initial Catalog=CustomerPortal;Integrated Security=SSPI; + + v19A + 2.0.1.0 + Data Source=vmBizTalkTST\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI; + + + + ALL + EDI_DEV@klgeurope.com + DEV + D:\ESB\KLG.TM\Shared\XMLDOC\IN\%MessageID%.xml + VMBIZTALKTST/ESB + + + 1.0.0.0 + KLG\BTS-SSO-Admins-DEV + 3.0.1.0 + Provider=SQLOLEDB.1;Data Source=nlDC1-BtsTST01\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI; + Data Source=NLDC1-BTSTST01\ESB;Initial Catalog=ESBLookups;Integrated Security=SSPI; + Provider=SQLOLEDB.1;Data Source=VMSQL3VENLO;Initial Catalog=ESBLookups;Integrated Security=SSPI; + E73F476956BF0DA8888B1B210EC7CD48861835EF + + D:\LOG\FTP\ + NLDC1-BTSTST01\ESB + T + \ No newline at end of file diff --git a/Deployment/EnvironmentSettings/Exported_DevSettings.xml b/Deployment/EnvironmentSettings/Exported_DevSettings.xml new file mode 100644 index 0000000..9b49c17 --- /dev/null +++ b/Deployment/EnvironmentSettings/Exported_DevSettings.xml @@ -0,0 +1,16 @@ + + + + + BizTalk Application Users + BizTalk Server Administrators + + + + + \ No newline at end of file diff --git a/Deployment/EnvironmentSettings/Exported_LocalSettings.xml b/Deployment/EnvironmentSettings/Exported_LocalSettings.xml new file mode 100644 index 0000000..6ff2224 --- /dev/null +++ b/Deployment/EnvironmentSettings/Exported_LocalSettings.xml @@ -0,0 +1,16 @@ + + + + + BizTalk Application Users + BizTalk Server Administrators + + + + + \ No newline at end of file diff --git a/Deployment/EnvironmentSettings/Exported_ProdSettings.xml b/Deployment/EnvironmentSettings/Exported_ProdSettings.xml new file mode 100644 index 0000000..c6ac9c7 --- /dev/null +++ b/Deployment/EnvironmentSettings/Exported_ProdSettings.xml @@ -0,0 +1,16 @@ + + + + + BizTalk Application Users + BizTalk Server Administrators + + + + + \ No newline at end of file diff --git a/Deployment/EnvironmentSettings/Exported_TestSettings.xml b/Deployment/EnvironmentSettings/Exported_TestSettings.xml new file mode 100644 index 0000000..a1f446e --- /dev/null +++ b/Deployment/EnvironmentSettings/Exported_TestSettings.xml @@ -0,0 +1,16 @@ + + + + + BizTalk Application Users + BizTalk Server Administrators + + + + + \ No newline at end of file diff --git a/Deployment/PortBindings.xml b/Deployment/PortBindings.xml index fed1c08..c16bdb6 100644 --- a/Deployment/PortBindings.xml +++ b/Deployment/PortBindings.xml @@ -5,23 +5,23 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + <Root> <Stages> <Stage CategoryId="9d0e4101-4cce-4536-83fa-4a5040674ad6"> @@ -130,17 +130,17 @@ </Group> </Filter> - + false 5 false false - TM.TransSmart + KLG.Extern - + <Root> <Stages> <Stage CategoryId="9d0e4101-4cce-4536-83fa-4a5040674ad6"> @@ -235,7 +235,7 @@ 5 false false - TM.TransSmart + KLG.Extern @@ -270,7 +270,7 @@ <FileNetFailRetryCount vt="19">5</FileNetFailRetryCount> <BatchSize vt="19">20</BatchSize> </CustomProps> - + <Root> <Stages> <Stage CategoryId="9d0e4103-4cce-4536-83fa-4a5040674ad6"> @@ -339,10 +339,10 @@ 0 0 - + false - TM.TransSmart + KLG.Extern @@ -372,7 +372,7 @@ <FileNetFailRetryCount vt="19">5</FileNetFailRetryCount> <BatchSize vt="19">20</BatchSize> </CustomProps> - + <Root> <Stages> <Stage CategoryId="9d0e4103-4cce-4536-83fa-4a5040674ad6"> @@ -431,10 +431,10 @@ 0 0 - + false - TM.TransSmart + KLG.Extern diff --git a/Deployment/PortBindingsMaster.xml b/Deployment/PortBindingsMaster.xml index 6c9a264..2eed03b 100644 --- a/Deployment/PortBindingsMaster.xml +++ b/Deployment/PortBindingsMaster.xml @@ -5,23 +5,23 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -136,7 +136,7 @@ - + false 5 @@ -146,7 +146,7 @@ - + @@ -284,7 +284,7 @@ 20 - + @@ -355,7 +355,7 @@ 0 0 - + false TM.TransSmart @@ -390,7 +390,7 @@ 20 - + @@ -451,7 +451,7 @@ 0 0 - + false TM.TransSmart diff --git a/PipelineComponents/PipelineComponents.csproj b/PipelineComponents/PipelineComponents.csproj index 0e6fe8c..049dd11 100644 --- a/PipelineComponents/PipelineComponents.csproj +++ b/PipelineComponents/PipelineComponents.csproj @@ -9,8 +9,9 @@ Properties TM.TransSmart.PipelineComponents TM.TransSmart.PipelineComponents - v4.5 + v4.6 512 + true diff --git a/PipelineComponents/Properties/AssemblyInfo.cs b/PipelineComponents/Properties/AssemblyInfo.cs index 22f92d5..cac8be2 100644 --- a/PipelineComponents/Properties/AssemblyInfo.cs +++ b/PipelineComponents/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("3.0.1.0")] +[assembly: AssemblyFileVersion("3.0.1.0")] diff --git a/Pipelines/Properties/AssemblyInfo.cs b/Pipelines/Properties/AssemblyInfo.cs index 99b4cc6..2220903 100644 --- a/Pipelines/Properties/AssemblyInfo.cs +++ b/Pipelines/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using Microsoft.BizTalk.XLANGs.BTXEngine; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.3.0")] -[assembly: AssemblyFileVersion("1.0.3.0")] +[assembly: AssemblyVersion("3.0.3.0")] +[assembly: AssemblyFileVersion("3.0.3.0")] diff --git a/Pipelines/Shipments.XMLReceive.btp.cs b/Pipelines/Shipments.XMLReceive.btp.cs index 052d9dc..27ab128 100644 --- a/Pipelines/Shipments.XMLReceive.btp.cs +++ b/Pipelines/Shipments.XMLReceive.btp.cs @@ -16,7 +16,7 @@ namespace TM.TransSmart.Pipelines " PipelineComponents.TrackingIdDecodingComponent,TM.Shared.Pipeli"+ -"neComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d TrackingIdDecodingComponent v1.0.2 Custom Pipeline "+ "Component used retrieve Context for tracking 1.0.2 "+ " TrackingIdDecodingCompone"+ "nt v1.0.2 true "+ " PipelineComponents.EncodingComponent,TM.Shared.PipelineComponents, "+ -"Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d Enc"+ +"Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d Enc"+ "odingComponent v1.3 Custom Pipeline Component used to change M"+ "essage Encoding 1.3.0.0 <"+ "Property Name=\"ComponentEnabled\"> "+ " EncodingComponent v1.3 true PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0,"+ +"> PipelineComponents.TrackingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0,"+ " Culture=neutral, PublicKeyToken=db1d2fbb73684f7d TrackingComponent v"+ "2.0.2 Custom Pipeline Component used to log messages instead o"+ "f DTA Tracking 2.0.2 "+ " TrackingComponent v2.0.2 true PipelineComponents.ReplaceComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, "+ +"> PipelineComponents.ReplaceComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, "+ "Culture=neutral, PublicKeyToken=db1d2fbb73684f7d ReplaceComponent v1."+ "3 Custom Pipeline Component used to replace strings in Message"+ " Content (delimiter: |) 1.3.0.0 "+ @@ -66,7 +66,7 @@ namespace TM.TransSmart.Pipelines "pe=\"xsd:string\" /> Replace"+ "Component v1.3 true PipelineComponents.NamespaceComponent,TM.Shared.PipelineCompon"+ -"ents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d NamespaceComponent v1.3 Custom Pipeline Component used to A"+ "dd, Remove or Replace the Message Namespace 1.3.0.0 "+ " NamespaceComponent v1.3 true "+ " PipelineComponents.TrackingComponent,TM.Shared.Pipel"+ -"ineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d TrackingComponent v2.0.2 Custom Pipeline Component"+ " used to log messages instead of DTA Tracking 2.0.2 "+ " TM.TransSmart.Pip"+ -"elineComponents.CPL_Debatch,TM.TransSmart.PipelineComponents, Version=1.0.1.0, Culture=neutral, Publ"+ +"elineComponents.CPL_Debatch,TM.TransSmart.PipelineComponents, Version=3.0.1.0, Culture=neutral, Publ"+ "icKeyToken=089e5464cda5fc95 TransSmart Debatch Disassembler Streaming TransSmart Debatch Disassembler Component "+ " 1.0 TransSmart Debatch Di"+ @@ -105,7 +105,7 @@ namespace TM.TransSmart.Pipelines " PipelineComponents.TrackingComponent,TM.S"+ -"hared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d "+ +"hared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d "+ " TrackingComponent v2.0.2 Custom Pipelin"+ "e Component used to log messages instead of DTA Tracking 2.0.2 "; - private const string _versionDependentGuid = "9b458fb3-27e2-4cab-b008-813be116621f"; + private const string _versionDependentGuid = "2b7dae02-82a7-4519-bea7-1d3ccbc4d9d9"; public Shipments_XMLReceive() { Microsoft.BizTalk.PipelineOM.Stage stage = this.AddStage(new System.Guid("9d0e4103-4cce-4536-83fa-4a5040674ad6"), Microsoft.BizTalk.PipelineOM.ExecutionMode.all); - IBaseComponent comp0 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingIdDecodingComponent,TM.Shared.PipelineComponents, Version=2.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");; + IBaseComponent comp0 = Microsoft.BizTalk.PipelineOM.PipelineManager.CreateComponent("PipelineComponents.TrackingIdDecodingComponent,TM.Shared.PipelineComponents, Version=3.0.1.0, Culture=neutral, PublicKeyToken=db1d2fbb73684f7d");; if (comp0 is IPersistPropertyBag) { string comp0XmlProperties = "49Gh8~l~@5T$^^9l diff --git a/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs b/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs index 8fdef27..315408c 100644 --- a/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs +++ b/Transforms/TM.Shared.OrderStatus_to_TM.TransSmart.Status.btm.cs @@ -105,19 +105,19 @@ namespace TM.TransSmart.Transforms { AssemblyName=""Microsoft.BizTalk.CrossReferencing, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"" ClassName=""Microsoft.BizTalk.CrossReferencing.CrossReferencing"" /> "; diff --git a/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm b/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm index 935b891dd76f6c35032919cebd7615773deb9d8d..60d4c3073fd3b6fbc2464985020b4e70a098610a 100644 GIT binary patch delta 71 zcmaFDKSy9g7^870Loq`tLj*%GgAYRpLlHwFLmp5hjUgY%&SkJ=P+|xLilhM5q%mXy VS*Z*un*$k(85xZ?A7zqf1prPy5B2~6 delta 20 bcmbOu@PvOu7~|$X#yrM}3LKkRm?c;NOcw>{ diff --git a/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs b/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs index a254f69..80d2433 100644 --- a/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs +++ b/Transforms/TM.TransSmart.Shipment_to_TM.Shared.Order.btm.cs @@ -809,19 +809,19 @@ namespace TM.TransSmart.Transforms { AssemblyName=""Microsoft.BizTalk.CrossReferencing, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"" ClassName=""Microsoft.BizTalk.CrossReferencing.CrossReferencing"" /> "; -- 2.20.1 From c98221924baab3de651e30c7230afbc11a54105d Mon Sep 17 00:00:00 2001 From: "KLG\\tdradmin" Date: Thu, 19 Dec 2024 16:34:55 +0100 Subject: [PATCH 2/2] Fix migration --- Transforms.Test/[PRD70958084]TES.xml | 231 +++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 Transforms.Test/[PRD70958084]TES.xml diff --git a/Transforms.Test/[PRD70958084]TES.xml b/Transforms.Test/[PRD70958084]TES.xml new file mode 100644 index 0000000..d739813 --- /dev/null +++ b/Transforms.Test/[PRD70958084]TES.xml @@ -0,0 +1,231 @@ + + + + + + + 2.0 + OK + + + + + NDTINTERNA + + KLE + KLE + 15129906947400 + 0000106140 + Potterie + RIJ-14 + 5733.81 EUR + EUR + 20241218 + 080000 + 160000 + 20241220 + 093000 + 170000 + + + NON-DOCS + STANDARD + DATE~TIME~FIXED + DDP + 0 + 4 + 2302.72 KG + KG + 2.000000 + 0.00 + + EUR + + NEW + + + OTHER + BC3B6DA8 + + + ORDER + 58413 + + + YOUR_REFERENCE + - + + + DELIVERYNOTE + 146859 + + + INTERNAL_ZL_CITY + BOIS GUILLAUME + + + DELIVERYID + 84350 + + + INTERNAL_REF_PORTAL_UUID + 1c617b41-81dd-4a95-808e-e18d6a7f8340 + + + + + 1 + 0 + 00019999990000854178 + 0000106140001 + PALLET_DISP + + 1 + NEW + + + + + 120.00 + 80.00 + 0.00 + 835.80 + + + + + INTERNAL_REF_PORTAL_UUID + 28c2a23b-4115-47a1-9758-0e4fa4cc3983 + + + + 2 + 1 + 00019999990000854222 + 0000106140002 + PALLET_DISP:120x120 + + 1 + NEW + + + + + 120.00 + 120.00 + 0.00 + 1071.52 + + + + + INTERNAL_REF_PORTAL_UUID + 9b303856-a561-46f8-bfc4-281dca617aa8 + + + + 3 + 2 + 00019999990000854246 + 0000106140003 + PALLET_DISP:120x120 + + 1 + NEW + + + + + 120.00 + 120.00 + 0.00 + 87.00 + + + + + INTERNAL_REF_PORTAL_UUID + 606ba2e3-8492-4a1b-a60b-4606906fc42c + + + + 4 + 3 + 00019999990000854253 + 0000106140004 + PALLET_DISP + + 1 + NEW + + + + + 120.00 + 80.00 + 0.00 + 308.40 + + + + + INTERNAL_REF_PORTAL_UUID + 6014b03b-c0e7-4674-bd82-3e05cff4b54a + + + + + + INVC + Truffaut Isneauville + CS 40009 + + Barentin + 76360 + + FR + Ovide + 02-35126767 + + a.c.ovide@groupejullien.fr + + + + + RECV + Truffaut Isneauville + 100, Route de Neufchatel + + Isneauville + 76230 + + FR + A. Ovide + +33235126767 + + a.c.ovide@groupejullien.fr + + + + + SEND + NDT International BV + Biezenkamp 33 + + Gendt + 6691 EJ + + NL + + + + + NDTINGENDT01 + + + + + + + + \ No newline at end of file -- 2.20.1