Skip to content

Commit fb1a5ec

Browse files
author
ChaosGreyder
committed
Preparing ENG version #1
1 parent 47437ee commit fb1a5ec

12 files changed

+58
-142
lines changed

‎RG/ESB/Generated/SAPOperation.cls.xml

-103
This file was deleted.

‎RG/ESB/Common.cls.xml ‎SAP/ESB/Common.cls.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Common">
3+
<Class name="SAP.ESB.Common">
44
<Description>
55
Общие данные</Description>
66
<Abstract>1</Abstract>

‎RG/ESB/Message/IDocStreamRequest.cls.xml ‎SAP/ESB/Message/IDocStreamRequest.cls.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Message.IDocStreamRequest">
3+
<Class name="SAP.ESB.Message.IDocStreamRequest">
44
<Description>
5-
Тестовое сообщение, содержащее поток с IDoc</Description>
5+
Test message containing IDoc stream</Description>
66
<Super>Ens.Request</Super>
77
<TimeCreated>64924,57875.05004</TimeCreated>
88

@@ -66,6 +66,7 @@ This method intended for creating new requests from JBH</Description>
6666
<Type>%Storage.Persistent</Type>
6767
<DefaultData>IDocStreamRequestDefaultData</DefaultData>
6868
<Data name="IDocStreamRequestDefaultData">
69+
<Structure>listnode</Structure>
6970
<Subscript>"IDocStreamRequest"</Subscript>
7071
<Value name="1">
7172
<Value>Stream</Value>
@@ -76,6 +77,9 @@ This method intended for creating new requests from JBH</Description>
7677
<Value name="3">
7778
<Value>SAPSessionId</Value>
7879
</Value>
80+
<Value name="4">
81+
<Value>SAPConnectionId</Value>
82+
</Value>
7983
</Data>
8084
</Storage>
8185
</Class>

‎RG/ESB/Message/IDocStreamResponse.cls.xml ‎SAP/ESB/Message/IDocStreamResponse.cls.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Message.IDocStreamResponse">
3+
<Class name="SAP.ESB.Message.IDocStreamResponse">
44
<Description>
55
Тестовое сообщение, содержащее поток с IDoc</Description>
66
<Super>Ens.Response</Super>
@@ -11,5 +11,17 @@
1111
Объединённый с MessageId & Token поток]]></Description>
1212
<Type>%Stream.GlobalCharacter</Type>
1313
</Property>
14+
15+
<Storage name="Default">
16+
<Type>%Storage.Persistent</Type>
17+
<DefaultData>IDocStreamResponseDefaultData</DefaultData>
18+
<Data name="IDocStreamResponseDefaultData">
19+
<Structure>listnode</Structure>
20+
<Subscript>"IDocStreamResponse"</Subscript>
21+
<Value name="1">
22+
<Value>Stream</Value>
23+
</Value>
24+
</Data>
25+
</Storage>
1426
</Class>
1527
</Export>

‎RG/ESB/Message/TIDResponse.cls.xml ‎SAP/ESB/Message/TIDResponse.cls.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Message.TIDResponse">
3+
<Class name="SAP.ESB.Message.TIDResponse">
44
<Description>
55
Сообщение-ответ с TID от SAP</Description>
66
<Super>Ens.Response</Super>

‎RG/ESB/Operation/SAPUnwrapper.cls.xml ‎SAP/ESB/Operation/SAPUnwrapper.cls.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Operation.SAPUnwrapper">
3+
<Class name="SAP.ESB.Operation.SAPUnwrapper">
44
<Description>
55
Обработка псевдоответа от SAP</Description>
66
<Super>Ens.BusinessOperation</Super>
@@ -13,20 +13,20 @@
1313
<Method name="OnMessage">
1414
<Description>
1515
This is the default message handler. All request types not declared in the message map are delivered here</Description>
16-
<FormalSpec>pRequest:Ens.Request,*pResponse:RG.ESB.Message.TIDResponse</FormalSpec>
16+
<FormalSpec>pRequest:Ens.Request,*pResponse:SAP.ESB.Message.TIDResponse</FormalSpec>
1717
<ReturnType>%Status</ReturnType>
1818
<Implementation><![CDATA[
1919
s tid = ""
2020
s tRequestId = pRequest.%Id()
2121
2222
// Получаем TID из развязочной таблицы и отправляем его в ответе Отправителю.
2323
$$$TRACE("MessageBodyId = " _ tRequestId)
24-
&sql(select TID into :tid from RG_ESB_SAP.TIDQueue where Request = :tRequestId)
24+
&sql(select TID into :tid from SAP_ESB_SAP.TIDQueue where Request = :tRequestId)
2525
2626
$$$TRACE("Got TID=" _ tid _ " for RequestId=" _ tRequestId)
2727
2828
// Формируем Ответ
29-
s pResponse = ##class(RG.ESB.Message.TIDResponse).%New()
29+
s pResponse = ##class(SAP.ESB.Message.TIDResponse).%New()
3030
s pResponse.TID = tid
3131
s pResponse.Request = pRequest
3232

‎RG/ESB/Operation/SAPWrapper.cls.xml ‎SAP/ESB/Operation/SAPWrapper.cls.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Operation.SAPWrapper">
3+
<Class name="SAP.ESB.Operation.SAPWrapper">
44
<Description>
55
Операция добавляет заголовок к сообщению, передаваемому в Java-Операцию</Description>
6-
<Super>Ens.BusinessOperation,RG.ESB.Common</Super>
6+
<Super>Ens.BusinessOperation,SAP.ESB.Common</Super>
77
<TimeCreated>64922,64689.283136</TimeCreated>
88

99
<Parameter name="INVOCATION">
@@ -13,11 +13,11 @@
1313
<Method name="OnMessage">
1414
<Description>
1515
This is the default message handler. All request types not declared in the message map are delivered here</Description>
16-
<FormalSpec>pRequest:RG.ESB.Message.IDocStreamRequest,*pResponse:RG.ESB.Message.IDocStreamResponse</FormalSpec>
16+
<FormalSpec>pRequest:SAP.ESB.Message.IDocStreamRequest,*pResponse:SAP.ESB.Message.IDocStreamResponse</FormalSpec>
1717
<ReturnType>%Status</ReturnType>
1818
<Implementation><![CDATA[
1919
20-
s pResponse = ##class(RG.ESB.Message.IDocStreamResponse).%New()
20+
s pResponse = ##class(SAP.ESB.Message.IDocStreamResponse).%New()
2121
2222
s token = ""
2323

‎RG/ESB/Process/IDocProcess.cls.xml ‎SAP/ESB/Process/IDocProcess.cls.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Process.IDocProcess">
3+
<Class name="SAP.ESB.Process.IDocProcess">
44
<Description>
55
Тестовый процесс обработки</Description>
66
<Super>Ens.BusinessProcessBPL</Super>
@@ -11,33 +11,33 @@
1111
BPL Definition</Description>
1212
<XMLNamespace>http://www.intersystems.com/bpl</XMLNamespace>
1313
<Data><![CDATA[
14-
<process language='objectscript' request='RG.ESB.Message.IDocStreamRequest' response='RG.ESB.Message.TIDResponse' version='3' height='2000' width='2000' >
14+
<process language='objectscript' request='SAP.ESB.Message.IDocStreamRequest' response='SAP.ESB.Message.TIDResponse' version='3' height='2000' width='2000' >
1515
<sequence xend='200' yend='650' >
1616
<trace name='BP Entry' value='"BP Entry"' xpos='200' ypos='250' >
1717
<annotation><![CDATA[Вход в БП]]]]><![CDATA[></annotation>
1818
</trace>
19-
<call name='Преобразование запроса' target='RG.ESB.Operation.SAPWrapper' async='0' xpos='200' ypos='350' >
19+
<call name='Преобразование запроса' target='SAP.ESB.Operation.SAPWrapper' async='0' xpos='200' ypos='350' >
2020
<annotation><![CDATA[Дополняем поток для передачи в SAPOperation]]]]><![CDATA[></annotation>
21-
<request type='RG.ESB.Message.IDocStreamRequest' >
21+
<request type='SAP.ESB.Message.IDocStreamRequest' >
2222
<assign property="callrequest" value="request" action="set" />
2323
</request>
24-
<response type='RG.ESB.Message.IDocStreamResponse' >
24+
<response type='SAP.ESB.Message.IDocStreamResponse' >
2525
<assign property="request.Stream" value="callresponse.Stream" action="set" />
2626
</response>
2727
</call>
28-
<call name='Вызов операции JBH' target='RG.ESB.Generated.SAPOperation' async='0' xpos='200' ypos='450' >
28+
<call name='Вызов операции JBH' target='SAP.ESB.Generated.SAPOperation' async='0' xpos='200' ypos='450' >
2929
<annotation><![CDATA[Вызываем Java-операцию отправки данных]]]]><![CDATA[></annotation>
30-
<request type='RG.ESB.Message.IDocStreamRequest' >
30+
<request type='SAP.ESB.Message.IDocStreamRequest' >
3131
<assign property="callrequest.Stream" value="request.Stream" action="set" />
3232
</request>
3333
<response type='Ens.Response' />
3434
</call>
35-
<call name='Получение TID' target='RG.ESB.Operation.SAPUnwrapper' async='0' xpos='200' ypos='550' >
35+
<call name='Получение TID' target='SAP.ESB.Operation.SAPUnwrapper' async='0' xpos='200' ypos='550' >
3636
<annotation><![CDATA[Получаем TID из развязки]]]]><![CDATA[></annotation>
37-
<request type='RG.ESB.Message.IDocStreamRequest' >
37+
<request type='SAP.ESB.Message.IDocStreamRequest' >
3838
<assign property="callrequest" value="request" action="set" />
3939
</request>
40-
<response type='RG.ESB.Message.TIDResponse' >
40+
<response type='SAP.ESB.Message.TIDResponse' >
4141
<assign property="response" value="callresponse" action="set" />
4242
</response>
4343
</call>

‎RG/ESB/Production/SAPProduction.cls.xml ‎SAP/ESB/Production/SAPProduction.cls.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Production.SAPProduction">
3+
<Class name="SAP.ESB.Production.SAPProduction">
44
<Super>Ens.Production</Super>
55
<TimeCreated>64922,56317.900901</TimeCreated>
66

77
<XData name="ProductionDefinition">
88
<Data><![CDATA[
9-
<Production Name="RG.ESB.Production.SAPProduction" TestingEnabled="true" LogGeneralTraceEvents="true">
9+
<Production Name="SAP.ESB.Production.SAPProduction" TestingEnabled="true" LogGeneralTraceEvents="true">
1010
<Description>Тестовая Продукция (версия 2) для взаимодействия с SAP</Description>
1111
<ActorPoolSize>2</ActorPoolSize>
1212
<Item Name="EnsLib.JavaGateway.Initiator" Category="Servicing" ClassName="EnsLib.JavaGateway.Initiator" PoolSize="1" Enabled="true" Foreground="false" Comment="Created by the Java Gateway Production Wizard" LogTraceEvents="true" Schedule="">
@@ -16,16 +16,16 @@
1616
</Item>
1717
<Item Name="ProductionMonitorService" Category="Servicing" ClassName="Ens.ProductionMonitorService" PoolSize="1" Enabled="true" Foreground="false" Comment="Служба мониторинга состояния Продукции" LogTraceEvents="false" Schedule="">
1818
</Item>
19-
<Item Name="Initiator" Category="SAP" ClassName="RG.ESB.Service.Initiator" PoolSize="1" Enabled="true" Foreground="false" Comment="Отправка тестового документа в процессинг" LogTraceEvents="true" Schedule="">
19+
<Item Name="Initiator" Category="SAP" ClassName="SAP.ESB.Service.Initiator" PoolSize="1" Enabled="true" Foreground="false" Comment="Отправка тестового документа в процессинг" LogTraceEvents="true" Schedule="">
2020
<Setting Target="Adapter" Name="FilePath">C:\lab_in</Setting>
2121
<Setting Target="Adapter" Name="FileSpec">*.xml</Setting>
22-
<Setting Target="Host" Name="Destination">RG.ESB.Process.IDocProcess</Setting>
22+
<Setting Target="Host" Name="Destination">SAP.ESB.Process.IDocProcess</Setting>
2323
</Item>
24-
<Item Name="RG.ESB.Operation.SAPWrapper" Category="SAP" ClassName="RG.ESB.Operation.SAPWrapper" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
24+
<Item Name="SAP.ESB.Operation.SAPWrapper" Category="SAP" ClassName="SAP.ESB.Operation.SAPWrapper" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
2525
</Item>
26-
<Item Name="RG.ESB.Process.IDocProcess" Category="SAP" ClassName="RG.ESB.Process.IDocProcess" PoolSize="1" Enabled="true" Foreground="false" Comment="Демонстрационный Бизнес-Процесс" LogTraceEvents="true" Schedule="">
26+
<Item Name="SAP.ESB.Process.IDocProcess" Category="SAP" ClassName="SAP.ESB.Process.IDocProcess" PoolSize="1" Enabled="true" Foreground="false" Comment="Демонстрационный Бизнес-Процесс" LogTraceEvents="true" Schedule="">
2727
</Item>
28-
<Item Name="RG.ESB.Generated.SAPOperation" Category="SAP" ClassName="RG.ESB.Generated.SAPOperation" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
28+
<Item Name="SAP.ESB.Generated.SAPOperation" Category="SAP" ClassName="SAP.ESB.Generated.SAPOperation" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
2929
<Setting Target="Host" Name="IRISHost">localhost</Setting>
3030
<Setting Target="Host" Name="IRISNamespace">SAPEX2</Setting>
3131
<Setting Target="Host" Name="IRISPassword">SYS</Setting>
@@ -35,7 +35,7 @@
3535
<Setting Target="Host" Name="JCoName">N4H-v014</Setting>
3636
<Setting Target="Host" Name="LogFileName">c:\log-035.txt</Setting>
3737
</Item>
38-
<Item Name="RG.ESB.Operation.SAPUnwrapper" Category="SAP" ClassName="RG.ESB.Operation.SAPUnwrapper" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
38+
<Item Name="SAP.ESB.Operation.SAPUnwrapper" Category="SAP" ClassName="SAP.ESB.Operation.SAPUnwrapper" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
3939
</Item>
4040
</Production>
4141
]]></Data>

‎RG/ESB/SAP/TIDQueue.cls.xml ‎SAP/ESB/SAP/TIDQueue.cls.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.SAP.TIDQueue">
3+
<Class name="SAP.ESB.SAP.TIDQueue">
44
<Description>
55
Intermediate Queue between Messages and SAP Transaction ID</Description>
66
<IncludeCode>Ensemble</IncludeCode>
@@ -66,12 +66,14 @@ Add a new link record</Description>
6666

6767
<Storage name="Default">
6868
<Type>%Storage.Persistent</Type>
69-
<DataLocation>^RG.ESB.SAP.TIDQueueD</DataLocation>
69+
<DataLocation>^SAP.ESB.SAP.TIDQueueD</DataLocation>
7070
<DefaultData>TIDQueueDefaultData</DefaultData>
71-
<IdLocation>^RG.ESB.SAP.TIDQueueD</IdLocation>
72-
<IndexLocation>^RG.ESB.SAP.TIDQueueI</IndexLocation>
73-
<StreamLocation>^RG.ESB.SAP.TIDQueueS</StreamLocation>
71+
<IdLocation>^SAP.ESB.SAP.TIDQueueD</IdLocation>
72+
<IndexLocation>^SAP.ESB.SAP.TIDQueueI</IndexLocation>
73+
<StreamLocation>^SAP.ESB.SAP.TIDQueueS</StreamLocation>
7474
<Data name="TIDQueueDefaultData">
75+
<Structure>listnode</Structure>
76+
<Subscript/>
7577
<Value name="1">
7678
<Value>%%CLASSNAME</Value>
7779
</Value>

‎RG/ESB/Service/Initiator.cls.xml ‎SAP/ESB/Service/Initiator.cls.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Export generator="IRIS" version="26">
3-
<Class name="RG.ESB.Service.Initiator">
3+
<Class name="SAP.ESB.Service.Initiator">
44
<Description>
55
Тестовая служба для проверки Продукции. Запускает процесс отправки документов через Бизнес-Процесс.</Description>
66
<Super>Ens.BusinessService</Super>
@@ -25,15 +25,15 @@
2525
<FormalSpec>pInput:%Stream.Object,*pOutput:%RegisteredObject</FormalSpec>
2626
<ReturnType>%Status</ReturnType>
2727
<Implementation><![CDATA[
28-
s message = ##class(RG.ESB.Message.IDocStreamRequest).%New()
28+
s message = ##class(SAP.ESB.Message.IDocStreamRequest).%New()
2929
d message.Stream.CopyFromAndSave(pInput)
3030
3131
d pInput.Rewind()
3232
$$$TRACE("Incoming iDoc received: " _ pInput.Read(1024))
3333
3434
$$$TRACE("Sending to Destination: " _ ..Destination)
3535
36-
#dim response As RG.ESB.Message.TIDResponse = ##class(RG.ESB.Message.TIDResponse).%New()
36+
#dim response As SAP.ESB.Message.TIDResponse = ##class(SAP.ESB.Message.TIDResponse).%New()
3737
s sc = ..SendRequestSync(..Destination, message, .response)
3838
if ($$$ISERR(sc)) {
3939
$$$LOGERROR(sc)

‎sc-list.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ RG.ESB.Production.SAPProduction.cls
1010
RG.ESB.SAP.TIDQueue.cls
1111
RG.ESB.SAPProduction.cls
1212
RG.ESB.Service.Initiator.cls
13+
SAP.pkg

0 commit comments

Comments
 (0)