Skip to content

Commit

Permalink
Revert "Make zapm compatible with both older and newer version of ZPM"
Browse files Browse the repository at this point in the history
  • Loading branch information
SergeyMi37 authored Jun 12, 2024
1 parent 6bdb3ce commit d370c2c
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 39 deletions.
2 changes: 1 addition & 1 deletion module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Resource Name="%ZAPM.ZpmLoad.GBL" />
<UnitTest Name="/unitest/zapm/" Package="ZAPM.unutest.zapm" Phase="verify"/>
<Invokes>
<Invoke Class="%ZAPM.compat.Compat" Method="CheckCompatibility" Phase="Reload" When="After" />
<Invoke Class="%ZAPM.ext.zapp" Method="init"></Invoke>
</Invokes>
</Module>
</Document>
Expand Down
37 changes: 0 additions & 37 deletions preload/cls/_ZAPM/compat/Compat.cls

This file was deleted.

20 changes: 20 additions & 0 deletions preload/cls/_ZAPM/ext/Lifecycle.cls
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Class %ZAPM.ext.Lifecycle Extends %ZPM.PackageManager.Developer.Lifecycle.Module
{

ClassMethod RunOnLoad() [ CodeMode = objectgenerator ]
{

Set sc = $$$OK
Try {
if $Namespace'="%SYS" {
$$$ThrowOnError($$$ERROR($$$GeneralError,"This application must be installed in the ""%SYS"" namespace "))
}
;$$$ThrowOnError($$$ERROR($$$GeneralError,"some error"))
} Catch e {
Set sc = e.AsStatus()
}
Return sc
}

}

2 changes: 1 addition & 1 deletion src/cls/%ZAPM/ext/Lifecycle.cls
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Class %ZAPM.ext.Lifecycle Extends %IPM.Lifecycle.Module
Class %ZAPM.ext.Lifecycle Extends %ZPM.PackageManager.Developer.Lifecycle.Module
{

ClassMethod RunOnLoad() [ CodeMode = objectgenerator ]
Expand Down

0 comments on commit d370c2c

Please sign in to comment.