From aab8fbd674b1632eb0cc2a243cc6939fe723ba02 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Tue, 18 Mar 2014 15:19:06 +0400
Subject: [PATCH] Rename MavenArtifactResourceConfiguration to
 MavenWebArtifactConfiguration

---
 .../MavenWebArtifactRootCopyingHandlerProvider.java       | 2 +-
 .../jps/maven/model/impl/MavenProjectConfiguration.java   | 4 ++--
 ...figuration.java => MavenWebArtifactConfiguration.java} | 2 +-
 .../MavenResourceCompilerConfigurationGenerator.java      | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/{MavenArtifactResourceConfiguration.java => MavenWebArtifactConfiguration.java} (97%)

diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenWebArtifactRootCopyingHandlerProvider.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenWebArtifactRootCopyingHandlerProvider.java
index 6e0deabe509f..b7015992d3e1 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenWebArtifactRootCopyingHandlerProvider.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenWebArtifactRootCopyingHandlerProvider.java
@@ -48,7 +48,7 @@ public class MavenWebArtifactRootCopyingHandlerProvider extends ArtifactRootCopy
     if (!mavenExtensionService.hasMavenProjectConfiguration(buildDataPaths)) return null;
 
     MavenProjectConfiguration projectConfiguration = mavenExtensionService.getMavenProjectConfiguration(buildDataPaths);
-    MavenArtifactResourceConfiguration artifactResourceConfiguration = projectConfiguration.artifactsResources.get(artifact.getName());
+    MavenWebArtifactConfiguration artifactResourceConfiguration = projectConfiguration.webArtifactConfigs.get(artifact.getName());
     if (artifactResourceConfiguration == null) return null;
 
     ResourceRootConfiguration rootConfiguration = artifactResourceConfiguration.getRootConfiguration(root);
diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java
index a6ecdcae62c0..b0af7cf2829a 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java
@@ -49,9 +49,9 @@ public class MavenProjectConfiguration {
   @MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false, entryTagName = "maven-module", keyAttributeName = "name")
   public Map<String, MavenModuleResourceConfiguration> moduleConfigurations = new THashMap<String, MavenModuleResourceConfiguration>();
 
-  @Tag("web-resources")
+  @Tag("web-artifact-cfg")
   @MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false, entryTagName = "artifact", keyAttributeName = "name")
-  public Map<String, MavenArtifactResourceConfiguration> artifactsResources = new THashMap<String, MavenArtifactResourceConfiguration>();
+  public Map<String, MavenWebArtifactConfiguration> webArtifactConfigs = new THashMap<String, MavenWebArtifactConfiguration>();
 
   @Nullable
   public MavenModuleResourceConfiguration findProject(MavenIdBean id) {
diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenArtifactResourceConfiguration.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenWebArtifactConfiguration.java
similarity index 97%
rename from plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenArtifactResourceConfiguration.java
rename to plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenWebArtifactConfiguration.java
index 1a625488ddd8..1052e8e88ecf 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenArtifactResourceConfiguration.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenWebArtifactConfiguration.java
@@ -31,7 +31,7 @@ import java.util.Map;
 /**
  * @author Sergey Evdokimov
  */
-public class MavenArtifactResourceConfiguration {
+public class MavenWebArtifactConfiguration {
   @Tag("web-artifact-name")
   public String webArtifactName;
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
index 9b7db454e707..fcb8ce1113a6 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
@@ -241,15 +241,15 @@ public class MavenResourceCompilerConfigurationGenerator {
 
     String webArtifactName = MavenUtil.getArtifactName("war", module, true);
 
-    MavenArtifactResourceConfiguration artifactResourceCfg = projectCfg.artifactsResources.get(webArtifactName);
+    MavenWebArtifactConfiguration artifactResourceCfg = projectCfg.webArtifactConfigs.get(webArtifactName);
     if (artifactResourceCfg == null) {
-      artifactResourceCfg = new MavenArtifactResourceConfiguration();
+      artifactResourceCfg = new MavenWebArtifactConfiguration();
       artifactResourceCfg.webArtifactName = webArtifactName;
       artifactResourceCfg.moduleName = module.getName();
-      projectCfg.artifactsResources.put(webArtifactName, artifactResourceCfg);
+      projectCfg.webArtifactConfigs.put(webArtifactName, artifactResourceCfg);
     }
     else {
-      LOG.error("MavenArtifactResourceConfiguration already exists.");
+      LOG.error("MavenWebArtifactConfiguration already exists.");
     }
 
     if (webResources != null) {