Remove the configname from the exclusion keys

Author: jan

io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConfigurationDescription.java

@@ -173,7 +173,11 @@ public AutoBuildConfigurationDescription(ICConfigurationDescription cfgDescripti
 		myAutoMakeTarget = base.myAutoMakeTarget;
 		myIncrementalMakeTarget = base.myIncrementalMakeTarget;
 		myCleanMakeTarget = base.myCleanMakeTarget;
-		myTeamExclusionKeys = base.myTeamExclusionKeys;
+		if( base.myTeamExclusionKeys==null) {
+			myTeamExclusionKeys =null;
+		}else  {
+			myTeamExclusionKeys =new TreeSet<>( base.myTeamExclusionKeys);
+		}
 
 		myPreBuildStep = base.myPreBuildStep;
 		myPreBuildAnnouncement = base.myPreBuildAnnouncement;
@@ -263,7 +267,7 @@ public AutoBuildConfigurationDescription(ICConfigurationDescription cfgDescripti
 		if (teamExclusionKeys.isBlank()) {
 			myTeamExclusionKeys = null;
 		} else {
-			myTeamExclusionKeys = new HashSet<>(Arrays.asList(teamExclusionKeys.split(SEMICOLON)));
+			myTeamExclusionKeys = new TreeSet<>(Arrays.asList(teamExclusionKeys.split(SEMICOLON)));
 		}
 
 		myName = keyValues.getValue(NAME);
@@ -1261,10 +1265,10 @@ public Set<String> getTeamExclusionKeys() {
 	@Override
 	public Set<String> getDefaultTeamExclusionKeys() {
 		Set<String> ret = new TreeSet<>();
-		ret.add(getName() + DOT + KEY_TEAM + DOT + KEY_IS_SHARED);
-		ret.add(getName() + DOT + KEY_TEAM + DOT + KEY_EXCLUSIONS);
+		ret.add( KEY_TEAM + DOT + KEY_IS_SHARED);
+		//ret.add( KEY_TEAM + DOT + KEY_EXCLUSIONS);
 		if (myAutoBuildCfgExtDes != null) {
-			ret.addAll(myAutoBuildCfgExtDes.getTeamDefaultExclusionKeys(getName() + DOT + KEY_EXTENSION));
+			ret.addAll(myAutoBuildCfgExtDes.getTeamDefaultExclusionKeys( KEY_EXTENSION));
 		}
 		return ret;
 	}

io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConfigurationDescriptionProvider.java

@@ -154,10 +154,14 @@ public CConfigurationData applyConfiguration(ICConfigurationDescription cfgDescr
 			for (ICConfigurationDescription curConfDesc : projDesc.getConfigurations()) {
 				AutoBuildConfigurationDescription autoBuildConfigBase = (AutoBuildConfigurationDescription) curConfDesc
 						.getConfigurationData();
+				String prefix=curConfDesc.getName()+DOT;
 
 				Set<String> excludedKeys = autoBuildConfigBase.getTeamExclusionKeys();
+				if(!autoBuildConfigBase.isTeamShared()) {
+					keyValuePairs.removeKey(curConfDesc.getName());
+				}
 				for (String curKey : excludedKeys) {
-					keyValuePairs.removeKey(curKey);
+					keyValuePairs.removeKey(prefix+curKey);
 				}
 			}