Revision: 1432
Author: sber...@gmail.com
Date: Thu Dec 2 15:50:16 2010
Log: re-add struts2 to build.xml & pom.xml, cleanup compile.
http://code.google.com/p/google-guice/source/detail?r=1432
Modified:
/trunk/build.xml
/trunk/extensions/pom.xml
/trunk/extensions/struts2/build.properties
/trunk/extensions/struts2/src/com/google/inject/struts2/Struts2Factory.java
=======================================
--- /trunk/build.xml Mon Nov 22 17:39:31 2010
+++ /trunk/build.xml Thu Dec 2 15:50:16 2010
@@ -21,6 +21,7 @@
description="Build entire distribution.">
<ant antfile="extensions/servlet/build.xml" target="distjars"
inheritAll="false"/>
<ant antfile="extensions/spring/build.xml" target="distjars"
inheritAll="false"/>
+ <ant antfile="extensions/struts2/build.xml" target="distjars"
inheritAll="false"/>
<ant antfile="extensions/assistedinject/build.xml" target="distjars"
inheritAll="false"/>
<ant antfile="extensions/jmx/build.xml" target="distjars"
inheritAll="false"/>
<ant antfile="extensions/jndi/build.xml" target="distjars"
inheritAll="false"/>
@@ -34,6 +35,9 @@
<copy toDir="${build.dir}/dist">
<fileset dir="extensions/spring/build" includes="*.jar"
excludes="*-with-deps.jar"/>
</copy>
+ <copy toDir="${build.dir}/dist">
+ <fileset dir="extensions/struts2/build" includes="*.jar"
excludes="*-with-deps.jar"/>
+ </copy>
<copy toDir="${build.dir}/dist">
<fileset dir="extensions/assistedinject/build" includes="*.jar"
excludes="*-with-deps.jar"/>
</copy>
@@ -125,6 +129,7 @@
<fileset dir="${throwingproviders.src.dir}"/>
<fileset dir="${multibindings.src.dir}"/>
<fileset dir="${persist.src.dir}"/>
+ <fileset dir="${struts2.src.dir}"/>
<doclet name="jdiff.JDiff"
path="${jdiff.home}/jdiff.jar:${jdiff.home}/xerces.jar">
@@ -172,6 +177,8 @@
<fileset dir="${throwingproviders.src.dir}"/>
<fileset dir="${multibindings.src.dir}"/>
<fileset dir="${persist.src.dir}"/>
+ <!-- TODO: this breaks Doclava for some reason
+ <fileset dir="${struts2.src.dir}"/> -->
<doclet name="com.google.doclava.Doclava">
<param name="-hdf"/> <param name="project.name"/> <param
name="Guice"/>
@@ -231,6 +238,7 @@
description="Remove generated files.">
<ant dir="extensions/servlet" antfile="build.xml" target="clean"/>
<ant dir="extensions/spring" antfile="build.xml" target="clean"/>
+ <ant dir="extensions/struts2" antfile="build.xml" target="clean"/>
<ant dir="extensions/assistedinject" antfile="build.xml"
target="clean"/>
<ant dir="extensions/jmx" antfile="build.xml" target="clean"/>
<ant dir="extensions/jndi" antfile="build.xml" target="clean"/>
=======================================
--- /trunk/extensions/pom.xml Mon Nov 22 17:39:31 2010
+++ /trunk/extensions/pom.xml Thu Dec 2 15:50:16 2010
@@ -25,6 +25,7 @@
<module>persist</module>
<module>servlet</module>
<module>spring</module>
+ <module>struts2</module>
<module>throwingproviders</module>
<!--
| not yet promoted...
=======================================
--- /trunk/extensions/struts2/build.properties Sat Aug 21 16:50:30 2010
+++ /trunk/extensions/struts2/build.properties Thu Dec 2 15:50:16 2010
@@ -1,6 +1,7 @@
lib.dir=../../lib
ext.lib.dir=lib
src.dir=src
+test.dir=test
build.dir=build
module=com.google.inject.struts2
fragment=true
=======================================
---
/trunk/extensions/struts2/src/com/google/inject/struts2/Struts2Factory.java
Thu Dec 2 15:23:17 2010
+++
/trunk/extensions/struts2/src/com/google/inject/struts2/Struts2Factory.java
Thu Dec 2 15:50:16 2010
@@ -45,7 +45,7 @@
public class Struts2Factory extends ObjectFactory {
private static final long serialVersionUID = 1L;
- private static final Logger logger =
Logger.getLogger(Struts2FactoryTest.class.getName());
+ private static final Logger logger =
Logger.getLogger(Struts2Factory.class.getName());
private static final String ERROR_NO_INJECTOR =
"Cannot find a Guice injector. Are you sure you registered a
GuiceServletContextListener "
+ "that uses the Struts2GuicePluginModule in your application's
web.xml?";
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to google-guice-...@googlegroups.com.
To unsubscribe from this group, send email to
google-guice-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
