diff --git a/java/compiler/impl/src/com/intellij/openapi/deployment/LibraryLinkImpl.java b/java/compiler/impl/src/com/intellij/openapi/deployment/LibraryLinkImpl.java
index 79c3573a87e5..5ba4ddb456d3 100644
--- a/java/compiler/impl/src/com/intellij/openapi/deployment/LibraryLinkImpl.java
+++ b/java/compiler/impl/src/com/intellij/openapi/deployment/LibraryLinkImpl.java
@@ -63,10 +63,10 @@ import java.util.Map;
 public class LibraryLinkImpl extends LibraryLink {
   private static final Map<PackagingMethod, String> methodToDescriptionForDirs = new HashMap<PackagingMethod, String>();
   private static final Map<PackagingMethod, String> methodToDescriptionForFiles = new HashMap<PackagingMethod, String>();
-  @NonNls static final String LEVEL_ATTRIBUTE_NAME = "level";
-  @NonNls static final String URL_ELEMENT_NAME = "url";
+  @NonNls public static final String LEVEL_ATTRIBUTE_NAME = "level";
+  @NonNls public static final String URL_ELEMENT_NAME = "url";
   @NonNls private static final String TEMP_ELEMENT_NAME = "temp";
-  @NonNls static final String NAME_ATTRIBUTE_NAME = "name";
+  @NonNls public static final String NAME_ATTRIBUTE_NAME = "name";
 
   @NonNls private static final String JAR_SUFFIX = ".jar";
 
diff --git a/java/compiler/impl/src/com/intellij/openapi/deployment/PackagingConfigurationImpl.java b/java/compiler/impl/src/com/intellij/openapi/deployment/PackagingConfigurationImpl.java
index c77f8db4de15..06b6824e2594 100644
--- a/java/compiler/impl/src/com/intellij/openapi/deployment/PackagingConfigurationImpl.java
+++ b/java/compiler/impl/src/com/intellij/openapi/deployment/PackagingConfigurationImpl.java
@@ -28,7 +28,7 @@ public class PackagingConfigurationImpl implements PackagingConfiguration {
   @NonNls public static final String TYPE_ATTRIBUTE_NAME = "type";
   @NonNls public static final String CONTAINER_ELEMENT_NAME = "containerElement";
   @NonNls public static final String MODULE_TYPE = "module";
-  @NonNls private static final String LIBRARY_TYPE = "library";
+  @NonNls public static final String LIBRARY_TYPE = "library";
   public static final TObjectHashingStrategy<ContainerElement> IGNORING_ATTRIBUTES_EQUALITY = new ElementIgnoringAttributesEquality();
 
   public PackagingConfigurationImpl(@NotNull Module module) {
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java
index cce2dffccc67..b623908fa6ae 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java
@@ -39,7 +39,8 @@ public class ArtifactManagerImpl extends ArtifactManager implements ProjectCompo
   private final Project myProject;
   private final DefaultPackagingElementResolvingContext myResolvingContext;
   private boolean myInsideCommit = false;
-  @NonNls private static final String PACKAGING_ELEMENT_NAME = "element";
+  @NonNls public static final String PACKAGING_ELEMENT_NAME = "element";
+  @NonNls public static final String TYPE_ID_ATTRIBUTE = "id";
 
   public ArtifactManagerImpl(Project project) {
     myProject = project;
@@ -98,7 +99,7 @@ public class ArtifactManagerImpl extends ArtifactManager implements ProjectCompo
 
   private static Element serializePackagingElement(PackagingElement<?> packagingElement) {
     Element element = new Element(PACKAGING_ELEMENT_NAME);
-    element.setAttribute("id", packagingElement.getType().getId());
+    element.setAttribute(TYPE_ID_ATTRIBUTE, packagingElement.getType().getId());
     final Object bean = packagingElement.getState();
     if (bean != null) {
       XmlSerializer.serializeInto(bean, element);
@@ -112,7 +113,7 @@ public class ArtifactManagerImpl extends ArtifactManager implements ProjectCompo
   }
 
   private <T> PackagingElement<T> deserializeElement(Element element) {
-    final String id = element.getAttributeValue("id");
+    final String id = element.getAttributeValue(TYPE_ID_ATTRIBUTE);
     PackagingElementType<?> type = PackagingElementFactory.getInstance().findElementType(id);
     PackagingElement<T> packagingElement = (PackagingElement<T>)type.createEmpty(myProject);
     T state = packagingElement.getState();
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchivePackagingElement.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchivePackagingElement.java
index 80d352a21d48..9bad0a437700 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchivePackagingElement.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchivePackagingElement.java
@@ -21,6 +21,7 @@ import java.util.List;
  * @author nik
  */
 public class ArchivePackagingElement extends CompositeElementWithManifest<ArchivePackagingElement> {
+  @NonNls public static final String NAME_ATTRIBUTE = "name";
   private String myArchiveFileName;
 
   public ArchivePackagingElement() {
@@ -57,7 +58,7 @@ public class ArchivePackagingElement extends CompositeElementWithManifest<Archiv
     computeChildrenInstructions(creator.archive(myArchiveFileName), resolvingContext, compilerContext, artifactType);
   }
 
-  @Attribute("name")
+  @Attribute(NAME_ATTRIBUTE)
   public String getArchiveFileName() {
     return myArchiveFileName;
   }
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryPackagingElement.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryPackagingElement.java
index ea5975bb7043..67f6f0baa0a5 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryPackagingElement.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryPackagingElement.java
@@ -20,6 +20,7 @@ import java.util.List;
  * classpath is used for exploded WAR and EJB directories under exploded EAR
  */
 public class DirectoryPackagingElement extends CompositeElementWithManifest<DirectoryPackagingElement> {
+  @NonNls public static final String NAME_ATTRIBUTE = "name";
   private String myDirectoryName;
 
   public DirectoryPackagingElement() {
@@ -65,7 +66,7 @@ public class DirectoryPackagingElement extends CompositeElementWithManifest<Dire
     return "dir:" + myDirectoryName;
   }
 
-  @Attribute("name")
+  @Attribute(NAME_ATTRIBUTE)
   public String getDirectoryName() {
     return myDirectoryName;
   }
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyPackagingElement.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyPackagingElement.java
index 5489d657087f..31aacb6d70d4 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyPackagingElement.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyPackagingElement.java
@@ -26,6 +26,8 @@ import java.util.List;
  * @author nik
  */
 public class FileCopyPackagingElement extends PackagingElement<FileCopyPackagingElement> implements RenameablePackagingElement {
+  @NonNls public static final String PATH_ATTRIBUTE = "path";
+  @NonNls public static final String OUTPUT_FILE_NAME_ATTRIBUTE = "output-file-name";
   private String myFilePath;
   private String myRenamedOutputFileName;
 
@@ -114,7 +116,7 @@ public class FileCopyPackagingElement extends PackagingElement<FileCopyPackaging
     setRenamedOutputFileName(state.getRenamedOutputFileName());
   }
 
-  @Attribute("path")
+  @Attribute(PATH_ATTRIBUTE)
   public String getFilePath() {
     return myFilePath;
   }
@@ -124,7 +126,7 @@ public class FileCopyPackagingElement extends PackagingElement<FileCopyPackaging
   }
 
   @Nullable
-  @Attribute("output-file-name")
+  @Attribute(OUTPUT_FILE_NAME_ATTRIBUTE)
   public String getRenamedOutputFileName() {
     return myRenamedOutputFileName;
   }
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java
index 42886565d8fc..0706e54fbc5b 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java
@@ -17,6 +17,7 @@ import com.intellij.util.PathUtil;
 import com.intellij.util.xmlb.annotations.Attribute;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NonNls;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,6 +28,8 @@ import java.util.List;
 public class LibraryPackagingElement extends ComplexPackagingElement<LibraryPackagingElement> {
   private String myLevel;
   private String myName;
+  @NonNls public static final String LIBRARY_NAME_ATTRIBUTE = "name";
+  @NonNls public static final String LIBRARY_LEVEL_ATTRIBUTE = "level";
 
   public LibraryPackagingElement() {
     super(LibraryElementType.LIBRARY_ELEMENT_TYPE);
@@ -82,7 +85,7 @@ public class LibraryPackagingElement extends ComplexPackagingElement<LibraryPack
     myName = state.getName();
   }
 
-  @Attribute("level")
+  @Attribute(LIBRARY_LEVEL_ATTRIBUTE)
   public String getLevel() {
     return myLevel;
   }
@@ -91,7 +94,7 @@ public class LibraryPackagingElement extends ComplexPackagingElement<LibraryPack
     myLevel = level;
   }
 
-  @Attribute("name")
+  @Attribute(LIBRARY_NAME_ATTRIBUTE)
   public String getName() {
     return myName;
   }
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputPackagingElement.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputPackagingElement.java
index f6bbe9ed7b4d..f3f6d30fd4ff 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputPackagingElement.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputPackagingElement.java
@@ -23,6 +23,7 @@ import java.util.List;
  * @author nik
  */
 public class ModuleOutputPackagingElement extends PackagingElement<ModuleOutputPackagingElement> {
+  @NonNls public static final String MODULE_NAME_ATTRIBUTE = "name";
   private String myModuleName;
 
   public ModuleOutputPackagingElement() {
@@ -84,7 +85,7 @@ public class ModuleOutputPackagingElement extends PackagingElement<ModuleOutputP
     return "module:" + myModuleName;
   }
 
-  @Attribute("name")
+  @Attribute(MODULE_NAME_ATTRIBUTE)
   public String getModuleName() {
     return myModuleName;
   }
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
index e9e0f44fa7cf..f16237c0ddf6 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
@@ -39,10 +39,10 @@ import java.util.List;
  * @author nik
  */
 public class PackagingElementFactoryImpl extends PackagingElementFactory {
-  public static final DirectoryElementType DIRECTORY_ELEMENT_TYPE = new DirectoryElementType();
-  public static final ArchiveElementType ARCHIVE_ELEMENT_TYPE = new ArchiveElementType();
-  public static final FileCopyElementType FILE_COPY_ELEMENT_TYPE = new FileCopyElementType();
-  public static final ArtifactRootElementType ARTIFACT_ROOT_ELEMENT_TYPE = new ArtifactRootElementType();
+  public static final PackagingElementType<DirectoryPackagingElement> DIRECTORY_ELEMENT_TYPE = new DirectoryElementType();
+  public static final PackagingElementType<ArchivePackagingElement> ARCHIVE_ELEMENT_TYPE = new ArchiveElementType();
+  public static final PackagingElementType<FileCopyPackagingElement> FILE_COPY_ELEMENT_TYPE = new FileCopyElementType();
+  public static final PackagingElementType<ArtifactRootElement<?>> ARTIFACT_ROOT_ELEMENT_TYPE = new ArtifactRootElementType();
   private static final PackagingElementType[] STANDARD_TYPES = {
       DIRECTORY_ELEMENT_TYPE, ARCHIVE_ELEMENT_TYPE,
       LibraryElementType.LIBRARY_ELEMENT_TYPE, ModuleOutputElementType.MODULE_OUTPUT_ELEMENT_TYPE,
diff --git a/java/compiler/openapi/src/com/intellij/openapi/deployment/ContainerElement.java b/java/compiler/openapi/src/com/intellij/openapi/deployment/ContainerElement.java
index 337f675082f4..1c36568ed2bc 100644
--- a/java/compiler/openapi/src/com/intellij/openapi/deployment/ContainerElement.java
+++ b/java/compiler/openapi/src/com/intellij/openapi/deployment/ContainerElement.java
@@ -30,8 +30,8 @@ import java.util.Map;
 public abstract class ContainerElement implements JDOMExternalizable, Cloneable, ResolvableElement {
   private final Map<String,String> myAttributes = new LinkedHashMap<String, String>();
   private final Module myParentModule;
-  @NonNls public static final String URI_ATTR = "URI";
-  @NonNls public static final String PACKAGING_METHOD_ATTR = "method";
+  @NonNls public static final String URI_ATTRIBUTE = "URI";
+  @NonNls public static final String PACKAGING_METHOD_ATTRIBUTE = "method";
   @NonNls public static final String ELEMENT_ATTRIBUTE = "attribute";
   @NonNls public static final String ATTRIBUTE_NAME = "name";
   @NonNls public static final String ATTRIBUTE_VALUE = "value";
@@ -43,18 +43,18 @@ public abstract class ContainerElement implements JDOMExternalizable, Cloneable,
   public abstract String getPresentableName();
 
   public String getURI() {
-    return getAttribute(URI_ATTR);
+    return getAttribute(URI_ATTRIBUTE);
   }
 
   public void setURI(String uri) {
-    setAttribute(URI_ATTR, uri);
+    setAttribute(URI_ATTRIBUTE, uri);
   }
   public PackagingMethod getPackagingMethod() {
-    final String attribute = getAttribute(PACKAGING_METHOD_ATTR);
+    final String attribute = getAttribute(PACKAGING_METHOD_ATTRIBUTE);
     return attribute == null ? PackagingMethod.DO_NOT_PACKAGE : PackagingMethod.getDeploymentMethodById(attribute);
   }
   public void setPackagingMethod(PackagingMethod method) {
-    setAttribute(PACKAGING_METHOD_ATTR, method.getId());
+    setAttribute(PACKAGING_METHOD_ATTRIBUTE, method.getId());
   }
 
   public void setAttribute(String name, String value) {
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
index fd272c567f70..54bfe1ffacce 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
@@ -113,7 +113,7 @@ public class ArtifactEditorContextImpl implements ArtifactEditorContext {
     return myValidationManager;
   }
 
-  public void setValidationMananger(ArtifactValidationManagerImpl validationManager) {
+  public void setValidationManager(ArtifactValidationManagerImpl validationManager) {
     myValidationManager = validationManager;
   }
 
@@ -129,5 +129,5 @@ public class ArtifactEditorContextImpl implements ArtifactEditorContext {
     dialog.show();
     return dialog.isOK() ? dialog.getChosenElements() : Collections.<Library>emptyList();
   }
-  
+
 }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
index 1d8564edcfef..dbd3525a93eb 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
@@ -82,7 +82,7 @@ public class ArtifactEditorImpl implements ArtifactEditorEx {
                                                    FileChooserDescriptorFactory.createSingleFolderDescriptor());
     setOutputPath(outputPath);
     myValidationManager = new ArtifactValidationManagerImpl(this);
-    myContext.setValidationMananger(myValidationManager);
+    myContext.setValidationManager(myValidationManager);
   }
 
   private void setOutputPath(@Nullable String outputPath) {
diff --git a/java/openapi/src/com/intellij/facet/pointers/FacetPointersManager.java b/java/openapi/src/com/intellij/facet/pointers/FacetPointersManager.java
index a31fbeff8862..82ed83a23308 100644
--- a/java/openapi/src/com/intellij/facet/pointers/FacetPointersManager.java
+++ b/java/openapi/src/com/intellij/facet/pointers/FacetPointersManager.java
@@ -46,15 +46,23 @@ public abstract class FacetPointersManager {
     return moduleName + "/" + facetTypeId + "/" + facetName;
   }
 
+  @NotNull
   public static String constructId(@NotNull Facet facet) {
     return constructId(facet.getModule().getName(), facet.getType().getStringId(), facet.getName());
   }
 
-  public static String getFacetName(String facetPointerId) {
+  @NotNull
+  public static String getFacetName(@NotNull String facetPointerId) {
     return facetPointerId.substring(facetPointerId.lastIndexOf('/') + 1);
   }
 
+  @NotNull
   public static String getModuleName(String facetPointerId) {
     return facetPointerId.substring(0, facetPointerId.indexOf('/'));
   }
+
+  @NotNull
+  public static String getFacetType(@NotNull String facetPointerId) {
+    return facetPointerId.substring(facetPointerId.indexOf('/') + 1, facetPointerId.lastIndexOf('/'));
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/conversion/ProjectConverter.java b/platform/lang-impl/src/com/intellij/conversion/ProjectConverter.java
index 9c8189d6bb07..67ae1bce9e60 100644
--- a/platform/lang-impl/src/com/intellij/conversion/ProjectConverter.java
+++ b/platform/lang-impl/src/com/intellij/conversion/ProjectConverter.java
@@ -20,4 +20,7 @@ public abstract class ProjectConverter {
   public ConversionProcessor<WorkspaceSettings> createWorkspaceFileConverter() {
     return null;
   }
+
+  public void postProcess() {
+  } 
 }
diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java
index e747fbf339ae..b3f45215c7b6 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java
@@ -20,14 +20,15 @@ public class ConversionRunner {
   private boolean myProcessProjectFile;
   private boolean myProcessWorkspaceFile;
   private List<File> myModulesFilesToProcess = new ArrayList<File>();
+  private ProjectConverter myConverter;
 
   public ConversionRunner(ConverterProvider provider, ConversionContextImpl context) {
     myProvider = provider;
     myContext = context;
-    ProjectConverter converter = provider.createConverter(context);
-    myModuleFileConverter = converter.createModuleFileConverter();
-    myProjectFileConverter = converter.createProjectFileConverter();
-    myWorkspaceConverter = converter.createWorkspaceFileConverter();
+    myConverter = provider.createConverter(context);
+    myModuleFileConverter = myConverter.createModuleFileConverter();
+    myProjectFileConverter = myConverter.createProjectFileConverter();
+    myWorkspaceConverter = myConverter.createWorkspaceFileConverter();
   }
 
   public boolean isConversionNeeded() throws CannotConvertException {
@@ -106,6 +107,7 @@ public class ConversionRunner {
     for (File moduleFile : myModulesFilesToProcess) {
       myModuleFileConverter.postProcess(myContext.getModuleSettings(moduleFile));
     }
+    myConverter.postProcess();
   }
 
   public ConverterProvider getProvider() {
diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/WorkspaceSettingsImpl.java b/platform/lang-impl/src/com/intellij/conversion/impl/WorkspaceSettingsImpl.java
index bd7233b3d698..4ea0082d6a8d 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/WorkspaceSettingsImpl.java
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/WorkspaceSettingsImpl.java
@@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.ArrayList;
 
 /**
  * @author nik
@@ -29,7 +30,7 @@ public class WorkspaceSettingsImpl extends ComponentManagerSettingsImpl implemen
       return Collections.emptyList();
     }
 
-    return JDomConvertingUtil.getChildren(element, CONFIGURATION_ELEMENT);
+    return new ArrayList<Element>(JDomConvertingUtil.getChildren(element, CONFIGURATION_ELEMENT));
   }
 
 }