Issue Metacello#115: importFrom: needs to specify MULTIPLE inactive a…

…ttribute lists to accomodate different lists for different platforms (i.e., squeak and gemstone or pharo1.4 and pharo2.0) (1.0-beta.31.1.5)

(cherry picked from commit 73265dd)

Conflicts:

	repository/Metacello-TestsMC.package/MetacelloToolBoxAPITestCase.class/methodProperties.json
	repository/Metacello-TestsMC.package/monticello.meta/version
	repository/Metacello-ToolBox.package/monticello.meta/version

repository/ConfigurationOfMetacello.package/ConfigurationOfMetacello.class/instance/version10beta3115..st

@@ -21,7 +21,7 @@ version10beta3115: spec
 - fix Issue 115 - Version generated from a baseline can have empty package versions in a platform-specific section
   https://github.com/dalehenrich/metacello-work/issues/115'.
             spec author: 'dkh'.
-            spec timestamp: '9/14/2012 07:11'.
+            spec timestamp: '9/14/2012 10:17'.
             spec
                 project: 'Gofer Core' with: '1.0.5.1';
                 project: 'Gofer Tests' with: '1.0.5.1'.
@@ -34,9 +34,9 @@ version10beta3115: spec
                 package: 'OB-Metacello' with: 'OB-Metacello-dkh.82';
                 package: 'Metacello-TestsReference' with: 'Metacello-TestsReference-DaleHenrichs.17';
                 package: 'Metacello-TestsCore' with: 'Metacello-TestsCore-DaleHenrichs.14';
-                package: 'Metacello-TestsMC' with: 'Metacello-TestsMC-dkh.348';
+                package: 'Metacello-TestsMC' with: 'Metacello-TestsMC-dkh.350';
                 package: 'Metacello-TestsTutorial' with: 'Metacello-TestsTutorial-dkh.33';
-                package: 'Metacello-ToolBox' with: 'Metacello-ToolBox-dkh.127' ].
+                package: 'Metacello-ToolBox' with: 'Metacello-ToolBox-dkh.129' ].
     spec
         for: #'gemstone'
         do: [ 

repository/ConfigurationOfMetacello.package/ConfigurationOfMetacello.class/methodProperties.json

@@ -120,7 +120,7 @@
 		"version10beta30:" : "dkh 6/12/2012 09:37:55.692",
 		"version10beta3113:" : "SeanDeNigris 6/18/2012 20:59",
 		"version10beta3114:" : "SeanDeNigris 6/27/2012 22:16",
-		"version10beta3115:" : "dkh 9/14/2012 07:11",
+		"version10beta3115:" : "dkh 9/14/2012 10:20",
 		"version10beta311:" : "dkh 6/12/2012 09:37:55.692",
 		"version10beta312:" : "dkh 6/12/2012 09:37:55.692",
 		"version10beta31:" : "dkh 6/12/2012 09:37:55.692",

repository/ConfigurationOfMetacello.package/ConfigurationOfMetacello.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "ConfigurationOfMetacello",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		"LastVersionLoad" ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "Object",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloAlternateResource.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC-Resources",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,4 +13,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestResource",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloAtomicConfigurationResource.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC-Resources",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestResource",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloAtomicLoadOrderTest.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloDictionaryRepositoryTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloAtomicMonticelloResource.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC-Resources",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,4 +13,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestResource",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloCleanUpChangeSetsTestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloConfigAPITestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -15,4 +16,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloConfigAbstractAPITestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloConfigAPIToolBoxTestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloConfigAbstractAPITestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloConfigAbstractAPITestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloConfigurationResource.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC-Resources",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		"ProjectAttributes" ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestResource",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloCurrentVersionTest.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloDictionaryRepositoryTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloDetermineCurrentVersionForLoadTest.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloDictionaryRepositoryTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloDictionaryRepositoryTest.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "GoferTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloExampleProjectConfig.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC-Configurations",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloMCTestsAbstractConfig",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloGoferBasedAtomicLoaderTest.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloGoferBasedLoaderTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloGoferBasedLoaderTest.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -13,4 +14,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloDictionaryRepositoryTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloGoferFunctionalTest.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloDictionaryRepositoryTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloGoferPackageTestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloHTTPRepositoryLoadTestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloImportsTestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloIssue108Resource.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC-Resources",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,4 +13,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestResource",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloIssue108TestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloIssue115TestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloIssue136TestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloLoadOrderTestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
+	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/Metacello-TestsMC.package/MetacelloMCCachingLoaderTestCase.class/properties.json

@@ -2,6 +2,7 @@
 	"category" : "Metacello-TestsMC",
 	"classinstvars" : [
 		 ],
+	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -11,4 +12,5 @@
 	"pools" : [
 		 ],
 	"super" : "MetacelloDictionaryRepositoryTest",
+	"traitcomposition" : "{}",
 	"type" : "normal" }