Revision: 1224
Author: [email protected]
Date: Fri Sep 10 22:06:17 2010
Log: more build configuration fixes
http://code.google.com/p/google-guice/source/detail?r=1224
Modified:
/trunk/build.properties
/trunk/build.xml
/trunk/extensions/persist/src/com/google/inject/persist/PersistenceFilter.java
/trunk/guice.ipr
=======================================
--- /trunk/build.properties Sun May 9 05:48:24 2010
+++ /trunk/build.properties Fri Sep 10 22:06:17 2010
@@ -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 @@
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.*
=======================================
--- /trunk/build.xml Sat Aug 21 16:50:30 2010
+++ /trunk/build.xml Fri Sep 10 22:06:17 2010
@@ -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"/>
=======================================
---
/trunk/extensions/persist/src/com/google/inject/persist/PersistenceFilter.java
Thu Sep 9 05:01:54 2010
+++
/trunk/extensions/persist/src/com/google/inject/persist/PersistenceFilter.java
Fri Sep 10 22:06:17 2010
@@ -42,7 +42,6 @@
* Example configuration:
* <pre>{...@code
* public class MyModule extends ServletModule {
- * @literal @Override
* public void configureServlets() {
* filter("/*").through(PersistenceFilter.class);
*
=======================================
--- /trunk/guice.ipr Fri Sep 10 19:07:33 2010
+++ /trunk/guice.ipr Fri Sep 10 22:06:17 2010
@@ -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" />
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
