diff options
| author | limpbizkit@gmail.com <limpbizkit@gmail.com@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-09-11 05:06:17 +0000 |
|---|---|---|
| committer | limpbizkit@gmail.com <limpbizkit@gmail.com@d779f126-a31b-0410-b53b-1d3aecad763e> | 2010-09-11 05:06:17 +0000 |
| commit | 9bcb0a2925dbd00d4dd964f48dec460d730fcf08 (patch) | |
| tree | 37896ac6f7d1529d86f8df508b98201f224865b8 | |
| parent | 52f0fa52e74f3d2dfc29dbe51e20ff53b57c8cfb (diff) | |
| download | guice-9bcb0a2925dbd00d4dd964f48dec460d730fcf08.tar.gz | |
more build configuration fixes
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1224 d779f126-a31b-0410-b53b-1d3aecad763e
| -rw-r--r-- | build.properties | 12 | ||||
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | extensions/persist/src/com/google/inject/persist/PersistenceFilter.java | 1 | ||||
| -rw-r--r-- | guice.ipr | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/build.properties b/build.properties index d44c958c..dbab5918 100644 --- a/build.properties +++ b/build.properties @@ -1,15 +1,16 @@ lib.dir=lib src.dir=src test.dir=test -servlet.src.dir=servlet/src -spring.src.dir=spring/src +servlet.src.dir=extensions/servlet/src +spring.src.dir=extensions/spring/src assistedinject.src.dir=extensions/assistedinject/src jmx.src.dir=extensions/jmx/src jndi.src.dir=extensions/jndi/src throwingproviders.src.dir=extensions/throwingproviders/src multibindings.src.dir=extensions/multibindings/src privatemodules.src.dir=extensions/privatemodules/src -lifecycle.src.dir=lifecycle/src +lifecycle.src.dir=extensions/lifecycle/src +persist.src.dir=extensions/persist/src build.dir=build javadoc.packagenames=com.google.inject,com.google.inject.spi,\ com.google.inject.matcher,\ @@ -23,7 +24,10 @@ javadoc.packagenames=com.google.inject,com.google.inject.spi,\ com.google.inject.throwingproviders,\ com.google.inject.multibindings,\ com.google.inject.privatemodules,\ - com.google.inject.util + com.google.inject.util,\ + com.google.inject.persist,\ + com.google.inject.persist.finder,\ + com.google.inject.persist.jpa test.class=com.google.inject.AllTests module=com.google.inject imports=!net.sf.cglib.*,!org.objectweb.asm.* @@ -27,6 +27,7 @@ <ant antfile="extensions/jndi/build.xml" target="distjars" inheritAll="false"/> <ant antfile="extensions/throwingproviders/build.xml" target="distjars" inheritAll="false"/> <ant antfile="extensions/multibindings/build.xml" target="distjars" inheritAll="false"/> + <ant antfile="extensions/persist/build.xml" target="distjars" inheritAll="false"/> <copy toDir="${build.dir}/dist"> <fileset dir="extensions/servlet/build" includes="*.jar" excludes="*-with-deps.jar"/> @@ -118,10 +119,11 @@ <pathelement location="${throwingproviders.src.dir}"/> <pathelement location="${multibindings.src.dir}"/> <pathelement location="${lifecycle.src.dir}"/> + <pathelement location="${persist.src.dir}"/> </sourcepath> <classpath refid="compile.classpath"/> <classpath> - <fileset dir="servlet/lib/build" includes="*.jar"/> + <fileset dir="extensions/servlet/lib/build" includes="*.jar"/> </classpath> <link href="http://aopalliance.sourceforge.net/doc"/> <link href="http://java.sun.com/javase/6/docs/api"/> diff --git a/extensions/persist/src/com/google/inject/persist/PersistenceFilter.java b/extensions/persist/src/com/google/inject/persist/PersistenceFilter.java index 28bfbc8b..d427c05b 100644 --- a/extensions/persist/src/com/google/inject/persist/PersistenceFilter.java +++ b/extensions/persist/src/com/google/inject/persist/PersistenceFilter.java @@ -42,7 +42,6 @@ import javax.servlet.ServletResponse; * Example configuration:
* <pre>{@code
* public class MyModule extends ServletModule {
- * @literal @Override
* public void configureServlets() {
* filter("/*").through(PersistenceFilter.class);
*
@@ -527,6 +527,7 @@ <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$/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" /> |