diff options
author | crazyboblee <crazyboblee@d779f126-a31b-0410-b53b-1d3aecad763e> | 2007-02-26 01:13:36 +0000 |
---|---|---|
committer | crazyboblee <crazyboblee@d779f126-a31b-0410-b53b-1d3aecad763e> | 2007-02-26 01:13:36 +0000 |
commit | 924e7e2afeaf323f9cc3de507c5af71c150fe2ba (patch) | |
tree | 346160609295edddb350d2c539d9b7043b481b80 /struts2 | |
parent | 59959addbbb91a39610702f312210d98d9ea1588 (diff) | |
download | guice-924e7e2afeaf323f9cc3de507c5af71c150fe2ba.tar.gz |
Updated struts2 directory structure to support maven. Updated intellij project.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@225 d779f126-a31b-0410-b53b-1d3aecad763e
Diffstat (limited to 'struts2')
-rw-r--r-- | struts2/example/src/main/java/com/google/inject/struts2/example/Count.java (renamed from struts2/example/src/com/google/inject/struts2/example/Count.java) | 0 | ||||
-rw-r--r-- | struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java (renamed from struts2/example/src/com/google/inject/struts2/example/Counter.java) | 0 | ||||
-rw-r--r-- | struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java (renamed from struts2/example/src/com/google/inject/struts2/example/ExampleModule.java) | 0 | ||||
-rw-r--r-- | struts2/example/src/main/java/com/google/inject/struts2/example/Main.java (renamed from struts2/example/src/com/google/inject/struts2/example/Main.java) | 0 | ||||
-rw-r--r-- | struts2/example/struts2-example.iml | 2 | ||||
-rw-r--r-- | struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java (renamed from struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java) | 0 | ||||
-rw-r--r-- | struts2/plugin/struts2-plugin.iml | 2 | ||||
-rw-r--r-- | struts2/struts2.iml | 145 |
8 files changed, 2 insertions, 147 deletions
diff --git a/struts2/example/src/com/google/inject/struts2/example/Count.java b/struts2/example/src/main/java/com/google/inject/struts2/example/Count.java index 4fca1516..4fca1516 100644 --- a/struts2/example/src/com/google/inject/struts2/example/Count.java +++ b/struts2/example/src/main/java/com/google/inject/struts2/example/Count.java diff --git a/struts2/example/src/com/google/inject/struts2/example/Counter.java b/struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java index c375b981..c375b981 100644 --- a/struts2/example/src/com/google/inject/struts2/example/Counter.java +++ b/struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java diff --git a/struts2/example/src/com/google/inject/struts2/example/ExampleModule.java b/struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java index b8a04f7e..b8a04f7e 100644 --- a/struts2/example/src/com/google/inject/struts2/example/ExampleModule.java +++ b/struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java diff --git a/struts2/example/src/com/google/inject/struts2/example/Main.java b/struts2/example/src/main/java/com/google/inject/struts2/example/Main.java index 60fd0bec..60fd0bec 100644 --- a/struts2/example/src/com/google/inject/struts2/example/Main.java +++ b/struts2/example/src/main/java/com/google/inject/struts2/example/Main.java diff --git a/struts2/example/struts2-example.iml b/struts2/example/struts2-example.iml index 23242c69..82ff94cd 100644 --- a/struts2/example/struts2-example.iml +++ b/struts2/example/struts2-example.iml @@ -4,7 +4,7 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java b/struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java index 588222c3..588222c3 100644 --- a/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java +++ b/struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java diff --git a/struts2/plugin/struts2-plugin.iml b/struts2/plugin/struts2-plugin.iml index b318a073..edabbce6 100644 --- a/struts2/plugin/struts2-plugin.iml +++ b/struts2/plugin/struts2-plugin.iml @@ -4,7 +4,7 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/struts2/struts2.iml b/struts2/struts2.iml deleted file mode 100644 index 3c77a1f9..00000000 --- a/struts2/struts2.iml +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/example/src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/plugin/src" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/commons-logging-1.0.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/xwork-2.0.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="file://$MODULE_DIR$/../../struts/xwork/src/java" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/struts-2.0.5-lib.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/freemarker-2.3.8.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/struts2-core-2.0.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/ognl-2.6.9.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module" module-name="guice" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jetty-util-6.1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jetty-6.1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/servlet-api-2.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/core-3.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jsp-api-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jsp-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/ant-1.6.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/struts2-api-2.0.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> - </component> -</module> - |