misc: Make the categories match the package name to ease exporting

7 files changed, 27 insertions, 17 deletions

diff --git a/src/GSMCMServiceRequest.st b/src/GSMCMServiceRequest.st
index 11a2410..7c4070c 100644
--- a/src/GSMCMServiceRequest.st
+++ b/src/GSMCMServiceRequest.st
@@ -19,7 +19,7 @@
 OsmoGSM.GSM48CMServiceReq extend [
     openTransactionOn: aCon sapi: aSapi [
         | tran |
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
 
         "This is weird. We can accept or reject the service."
         tran := (GSMCMServiceRequest on: aSapi with: self ti)
@@ -30,7 +30,7 @@ OsmoGSM.GSM48CMServiceReq extend [
 
 OsmoGSM.GSM48MSG extend [
     dispatchForCMOn: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         self logError: '%1(srcref:%2) unknown dispatch for CM Service Request'
             % {self class. aCon srcref} with: #bsc.
         ^ false
@@ -40,7 +40,7 @@ OsmoGSM.GSM48MSG extend [
 OsmoGSM.GSM48CCEmergencySetup extend [
     dispatchForCMOn: aCM [
         | call |
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
 
         "Start the Emergency Call"
         call := (GSMEmergencyCall on: 0 with: self ti)
diff --git a/src/GSMLURequest.st b/src/GSMLURequest.st
index c6e19f7..c8c2455 100644
--- a/src/GSMLURequest.st
+++ b/src/GSMLURequest.st
@@ -23,7 +23,7 @@ PackageLoader
 OsmoGSM.GSM48LURequest extend [
     openTransactionOn: aCon sapi: aSapi [
         | tran |
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         'foo' printNl.
 
         tran := (GSMLURequest on: aSapi with: self ti)
diff --git a/src/GSMMOCall.st b/src/GSMMOCall.st
index 426f116..f2bd816 100644
--- a/src/GSMMOCall.st
+++ b/src/GSMMOCall.st
@@ -18,42 +18,42 @@
 
 OsmoGSM.GSM48MSG extend [
     dispatchMoCall: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon moUnknown: self.
     ]
 ]
 
 OsmoGSM.GSM48CCConnectAck extend [
     dispatchMoCall: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon moConnectAck: self.
     ]
 ]
 
 OsmoGSM.GSM48CCDisconnect extend [
     dispatchMoCall: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon moDisconnect: self.
     ]
 ]
 
 OsmoGSM.GSM48CCRelease extend [
     dispatchMoCall: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon moRelease: self.
     ]
 ]
 
 OsmoGSM.GSM48CCReleaseCompl extend [
     dispatchMoCall: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon moReleaseCompl: self.
     ]
 ]
 
 OsmoGSM.GSM48CCStatus extend [
     dispatchMoCall: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon moStatus: self.
     ]
 ]
@@ -61,7 +61,7 @@ OsmoGSM.GSM48CCStatus extend [
 OsmoGSM.GSM48CCSetup extend [
     openTransactionOn: aCon sapi: aSapi [
         | tran |
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         tran := (GSMMOCall on: aSapi with: self ti)
                     con: aCon;
                     yourself.
diff --git a/src/GSMProcessor.st b/src/GSMProcessor.st
index 401cb4d..365931f 100644
--- a/src/GSMProcessor.st
+++ b/src/GSMProcessor.st
@@ -20,19 +20,19 @@ PackageLoader fileInPackage: 'OsmoGSM'.
 
 OsmoGSM.BSSAPMessage extend [
     dispatchTrans: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon bssapUnknownData: self
     ]
 ]
 
 OsmoGSM.BSSAPManagement extend [
     dispatchTrans: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         self dispatchMAP: aCon.
     ]
 
     dispatchMAP: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         (Dictionary from: {
             OsmoGSM.GSM0808Helper msgComplL3   -> #mapLayer3:.
             OsmoGSM.GSM0808Helper msgClearReq  -> #mapClearReq:.
@@ -51,14 +51,14 @@ OsmoGSM.BSSAPManagement extend [
 
 OsmoGSM.BSSAPDTAP extend [
     dispatchTrans: aCon [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         aCon dispatchDTAP: self.
     ]
 ]
 
 OsmoGSM.GSM48MSG extend [
     openTransactionOn: aCon sapi: aSapi [
-        <category: '*-OsmoMSC-GSM'>
+        <category: '*OsmoMSC-GSM'>
         self logError: 'Can not open transaction for %1' % {self class} area: #bsc.
     ]
 ]
diff --git a/src/MSC.st b/src/MSC.st
index 4da4883..e253758 100644
--- a/src/MSC.st
+++ b/src/MSC.st
@@ -301,7 +301,7 @@ Object subclass: MSCApplication [
             bscPort: 5000;
             sipIP: '127.0.0.1'.
         msc bscConfig
-            addBSC: '127.0.0.1' withName: 'test1' andLac: 4711 sendOsmoRSIP: true;
+            addBSC: '127.0.0.1' withName: 'test1' andLac: 8210 sendOsmoRSIP: true;
             addBSC: '10.240.240.1' withName: 'test2' andLac: 4712 sendOsmoRSIP: true.
 
         msc returnedFromSnapshot.
diff --git a/src/PagingManager.st b/src/PagingManager.st
index 544006b..10d89b4 100644
--- a/src/PagingManager.st
+++ b/src/PagingManager.st
@@ -18,6 +18,7 @@
 
 Object subclass: PagingManager [
     | msc |
+    <category: 'OsmoMSC-GSM'>
 
     PagingManager class >> initWith: aMsc [
         ^ self new
diff --git a/tests/AuthTest.st b/tests/AuthTest.st
index 4b56b62..334197d 100644
--- a/tests/AuthTest.st
+++ b/tests/AuthTest.st
@@ -17,6 +17,7 @@
 "
 
 TestCase subclass: AuthTestNull [
+    <category: 'OsmoMSC-Tests'>
     <comment: 'I smoke-test the null authenticator and that it
     fires an accept callback right away.'>
 
@@ -51,6 +52,7 @@ TestCase subclass: AuthTestNull [
 
 Object subclass: GSMProcessorMockBase [
     | auth dict |
+    <category: 'OsmoMSC-Tests'>
 
     GSMProcessorMockBase class >> initWith: anAuth [
         ^ self new
@@ -77,6 +79,8 @@ Object subclass: GSMProcessorMockBase [
 ]
 
 GSMProcessorMockBase subclass: GSMProcessorMockForAuthCheat [
+    <category: 'OsmoMSC-Tests'>
+
     nextPutData: aData [
         "Ignore the data for now. Should be a identity request"
         OsmoDispatcher dispatchBlock: [
@@ -90,6 +94,8 @@ GSMProcessorMockBase subclass: GSMProcessorMockForAuthCheat [
 ]
 
 GSMProcessorMockBase subclass: GSMProcessorMockForAuthIMSI [
+    <category: 'OsmoMSC-Tests'>
+
     usedIMSI [
         ^ '234324234234'
     ]
@@ -107,12 +113,15 @@ GSMProcessorMockBase subclass: GSMProcessorMockForAuthIMSI [
 ]
 
 GSMProcessorMockBase subclass: GSMProcessorMockForAuthTimeout [
+    <category: 'OsmoMSC-Tests'>
+
     nextPutData: aData [
         "Do nothing"
     ]
 ]
 
 TestCase subclass: AuthTestIdentity [
+    <category: 'OsmoMSC-Tests'>
     <comment: 'I test various aspects of the IMSI requestor.'>
 
     testWrongResponse [