next commit

chrkv · Sep 15, 2016 · f925e2a · f925e2a
1 parent 7e091f9
commit f925e2a
Show file tree

Hide file tree

Showing 40 changed files with 10 additions and 7 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/TreeConfigs.iml b/TreeConfigs.iml
@@ -4,11 +4,15 @@
     <facet type="Spring" name="Spring">
       <configuration>
         <fileset id="fileset" name="MyApp" removed="false" />
+        <fileset id="fileset3" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/main/java/com/intellij/treeConfigs/anno/ConfigE.java</file>
+        </fileset>
         <fileset id="fileset2" name="some long fileset name" removed="false">
           <file>file://$MODULE_DIR$/src/main/resources/META-INF/main.xml</file>
           <file>file://$MODULE_DIR$/src/main/resources/META-INF/my.properties</file>
           <file>file://$MODULE_DIR$/src/main/resources/META-INF/a.xml</file>
           <file>file://$MODULE_DIR$/src/main/resources/META-INF/b.xml</file>
+          <file>file://$MODULE_DIR$/src/main/java/com/intellij/treeConfigs/anno/ConfigE.java</file>
         </fileset>
       </configuration>
     </facet>
@@ -33,6 +37,8 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.7.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.9.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:jcl-over-slf4j:1.7.12" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.0.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.0.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.0.9.RELEASE" level="project" />

diff --git a/pom.xml b/pom.xml
diff --git a/src/main/java/com/intellij/treeConfigs/TreeConfigs.java b/src/main/java/com/intellij/treeConfigs/TreeConfigs.java
diff --git a/src/main/java/com/intellij/treeConfigs/UberConfig.java b/src/main/java/com/intellij/treeConfigs/UberConfig.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno/ConfigC.java b/src/main/java/com/intellij/treeConfigs/anno/ConfigC.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno/ConfigE.java b/src/main/java/com/intellij/treeConfigs/anno/ConfigE.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno/rdm.md b/src/main/java/com/intellij/treeConfigs/anno/rdm.md
diff --git a/src/main/java/com/intellij/treeConfigs/anno2/ConfigG.java b/src/main/java/com/intellij/treeConfigs/anno2/ConfigG.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno3/ConfigH.java b/src/main/java/com/intellij/treeConfigs/anno3/ConfigH.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno4/EmptyConf1.java b/src/main/java/com/intellij/treeConfigs/anno4/EmptyConf1.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno4/EmptyConf2.java b/src/main/java/com/intellij/treeConfigs/anno4/EmptyConf2.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno4/EmptyConf3.java b/src/main/java/com/intellij/treeConfigs/anno4/EmptyConf3.java
diff --git a/src/main/java/com/intellij/treeConfigs/anno4/StrangeCompScan.java b/src/main/java/com/intellij/treeConfigs/anno4/StrangeCompScan.java
diff --git a/src/main/java/com/intellij/treeConfigs/model/Child.java b/src/main/java/com/intellij/treeConfigs/model/Child.java
diff --git a/src/main/java/com/intellij/treeConfigs/model/GreatParent.java b/src/main/java/com/intellij/treeConfigs/model/GreatParent.java
diff --git a/src/main/java/com/intellij/treeConfigs/model/Parent.java b/src/main/java/com/intellij/treeConfigs/model/Parent.java
diff --git a/src/main/resources/META-INF/a.xml b/src/main/resources/META-INF/a.xml
diff --git a/src/main/resources/META-INF/b.xml b/src/main/resources/META-INF/b.xml
diff --git a/src/main/resources/META-INF/d.xml b/src/main/resources/META-INF/d.xml
diff --git a/src/main/resources/META-INF/d2.xml b/src/main/resources/META-INF/d2.xml
diff --git a/src/main/resources/META-INF/f.xml b/src/main/resources/META-INF/f.xml
diff --git a/src/main/resources/META-INF/main.xml b/src/main/resources/META-INF/main.xml
diff --git a/src/main/resources/META-INF/my.properties b/src/main/resources/META-INF/my.properties
diff --git a/src/main/resources/META-INF/q1.xml b/src/main/resources/META-INF/q1.xml
diff --git a/src/main/resources/META-INF/q2.xml b/src/main/resources/META-INF/q2.xml
diff --git a/src/main/resources/META-INF/q3.xml b/src/main/resources/META-INF/q3.xml
diff --git a/src/main/resources/META-INF/q3a.xml b/src/main/resources/META-INF/q3a.xml
diff --git a/src/main/resources/META-INF/q4.xml b/src/main/resources/META-INF/q4.xml
diff --git a/src/main/resources/META-INF/q5.xml b/src/main/resources/META-INF/q5.xml
diff --git a/src/main/resources/META-INF/q5a.xml b/src/main/resources/META-INF/q5a.xml