Permalink
Browse files

Accepted prompts from IntelliJ to configure Spring and Maven, which r…

…esulted in these changes to .iml files. I hope this was ok!
  • Loading branch information...
1 parent 3cfa43c commit 4c08860f77d8b52be971561c778e5cf174fca984 Anne Wright committed Apr 29, 2012
View
@@ -1,13 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="Spring" name="Spring">
+ <configuration>
+ <fileset id="fileset1" name="Xml Application Context" removed="false">
+ <file>file://$MODULE_DIR$/fluxtream-webapp/src/main/webapp/WEB-INF/applicationContext-security.xml</file>
+ <file>file://$MODULE_DIR$/fluxtream-webapp/target/ROOT/WEB-INF/applicationContext-security.xml</file>
+ <file>file://$MODULE_DIR$/fluxtream-webapp/src/main/webapp/WEB-INF/applicationContext.xml</file>
+ <file>file://$MODULE_DIR$/fluxtream-webapp/target/ROOT/WEB-INF/applicationContext.xml</file>
+ <file>file://$MODULE_DIR$/fluxtream-webapp/target/ROOT/WEB-INF/spring-quartz.xml</file>
+ <file>file://$MODULE_DIR$/fluxtream-webapp/target/ROOT/WEB-INF/springmvc-servlet.xml</file>
+ <file>file://$MODULE_DIR$/fluxtream-webapp/src/main/webapp/WEB-INF/spring-quartz.xml</file>
+ <file>file://$MODULE_DIR$/fluxtream-webapp/src/main/webapp/WEB-INF/springmvc-servlet.xml</file>
+ </fileset>
+ </configuration>
+ </facet>
+ </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.ocpsoft:ocpsoft-pretty-time:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.postmark:postmark-client:0.3.1" level="project" />
@@ -15,7 +15,7 @@
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="fluxtream-core" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
@@ -15,7 +15,7 @@
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="fluxtream-core" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
@@ -15,7 +15,7 @@
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
@@ -27,6 +27,17 @@
</descriptors>
</configuration>
</facet>
+ <facet type="Spring" name="Spring">
+ <configuration>
+ <fileset id="fileset1" name="Xml Application Context" removed="false">
+ <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/applicationContext-security.xml</file>
+ <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/applicationContext.xml</file>
+ <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml</file>
+ <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/spring-quartz.xml</file>
+ <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/widgets.xml</file>
+ </fileset>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
@@ -37,7 +48,7 @@
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library name="granule1.0.9.jar">
<CLASSES>

0 comments on commit 4c08860

Please sign in to comment.