Adjust IntelliJ metadata for moved projects.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@1222 d779f126-a31b-0410-b53b-1d3aecad763e

5 files changed, 21 insertions, 41 deletions

diff --git a/examples/examples.iml b/examples/examples.iml
index 9f903749..4c472b71 100644
--- a/examples/examples.iml
+++ b/examples/examples.iml
@@ -17,7 +17,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntryProperties />
   </component>
 </module>
 
diff --git a/extensions/persist/persist.iml b/extensions/persist/persist.iml
index b6a28a5a..173c0cd0 100644
--- a/extensions/persist/persist.iml
+++ b/extensions/persist/persist.iml
@@ -13,20 +13,20 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../servlet/lib/build/servlet-api-2.5.jar!/" />
+          <root url="file://$MODULE_DIR$/lib" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/lib" />
+          <root url="jar://$MODULE_DIR$/../struts2/lib/servlet-api-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
       </library>
     </orderEntry>
   </component>
diff --git a/extensions/struts2/example/struts2-example.iml b/extensions/struts2/example/struts2-example.iml
index 3d242915..da28d640 100644
--- a/extensions/struts2/example/struts2-example.iml
+++ b/extensions/struts2/example/struts2-example.iml
@@ -136,24 +136,6 @@
     <orderEntry type="module" module-name="guice" />
     <orderEntry type="module" module-name="servlet" />
     <orderEntry type="module" module-name="struts2-plugin" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../plugin/src" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
 
diff --git a/extensions/struts2/struts2-plugin.iml b/extensions/struts2/struts2-plugin.iml
index 2733e1c3..3a12397d 100644
--- a/extensions/struts2/struts2-plugin.iml
+++ b/extensions/struts2/struts2-plugin.iml
@@ -11,7 +11,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/servlet-api-2.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jsp-2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -20,7 +20,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/jetty-util-6.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jetty-6.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -29,7 +29,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/ant-1.6.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jetty-util-6.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -38,7 +38,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/struts2-api-2.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/xwork-2.0.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -47,7 +47,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/struts-2.0.5-lib.zip!/" />
+          <root url="jar://$MODULE_DIR$/lib/freemarker-2.3.8.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -56,7 +56,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/commons-logging-1.0.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/servlet-api-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -65,7 +65,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/ognl-2.6.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/core-3.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -74,7 +74,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/jsp-api-2.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/struts2-api-2.0.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -83,7 +83,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/xwork-2.0.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/ant-1.6.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -92,7 +92,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/jsp-2.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/ognl-2.6.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -101,7 +101,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/jetty-6.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/struts2-core-2.0.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -110,7 +110,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/freemarker-2.3.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/struts-2.0.5-lib.zip!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -119,7 +119,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/struts2-core-2.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/commons-logging-1.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -128,7 +128,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/core-3.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jsp-api-2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/guice.ipr b/guice.ipr
index af830aca..f75151f2 100644
--- a/guice.ipr
+++ b/guice.ipr
@@ -527,11 +527,10 @@
       <module fileurl="file://$PROJECT_DIR$/extensions/jmx/jmx.iml" filepath="$PROJECT_DIR$/extensions/jmx/jmx.iml" />
       <module fileurl="file://$PROJECT_DIR$/extensions/jndi/jndi.iml" filepath="$PROJECT_DIR$/extensions/jndi/jndi.iml" />
       <module fileurl="file://$PROJECT_DIR$/extensions/multibindings/multibindings.iml" filepath="$PROJECT_DIR$/extensions/multibindings/multibindings.iml" />
-      <module fileurl="file://$PROJECT_DIR$/extensions/persist/persist.iml" filepath="$PROJECT_DIR$/extensions/persist/persist.iml" />
-      <module fileurl="file://$PROJECT_DIR$/servlet/servlet.iml" filepath="$PROJECT_DIR$/servlet/servlet.iml" />
-      <module fileurl="file://$PROJECT_DIR$/spring/spring.iml" filepath="$PROJECT_DIR$/spring/spring.iml" />
-      <module fileurl="file://$PROJECT_DIR$/struts2/example/struts2-example.iml" filepath="$PROJECT_DIR$/struts2/example/struts2-example.iml" />
-      <module fileurl="file://$PROJECT_DIR$/struts2/plugin/struts2-plugin.iml" filepath="$PROJECT_DIR$/struts2/plugin/struts2-plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/extensions/servlet/servlet.iml" filepath="$PROJECT_DIR$/extensions/servlet/servlet.iml" />
+      <module fileurl="file://$PROJECT_DIR$/extensions/spring/spring.iml" filepath="$PROJECT_DIR$/extensions/spring/spring.iml" />
+      <module fileurl="file://$PROJECT_DIR$/extensions/struts2/example/struts2-example.iml" filepath="$PROJECT_DIR$/extensions/struts2/example/struts2-example.iml" />
+      <module fileurl="file://$PROJECT_DIR$/extensions/struts2/struts2-plugin.iml" filepath="$PROJECT_DIR$/extensions/struts2/struts2-plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/extensions/throwingproviders/throwingproviders.iml" filepath="$PROJECT_DIR$/extensions/throwingproviders/throwingproviders.iml" />
     </modules>
   </component>