Revision: 1205
Author: sberlin
Date: Sat Aug 21 16:50:30 2010
Log: move extensions that weren't under extensions/ into that directory.
simplify paths so everything is uniform for extensions.
http://code.google.com/p/google-guice/source/detail?r=1205
Added:
/trunk/extensions/lifecycle
/trunk/extensions/servlet
/trunk/extensions/spring
/trunk/extensions/struts2
/trunk/extensions/struts2/build.properties
/trunk/extensions/struts2/build.xml
/trunk/extensions/struts2/pom.xml
/trunk/extensions/struts2/src
/trunk/extensions/struts2/struts2-plugin.iml
Deleted:
/trunk/extensions/struts2/plugin/build.properties
/trunk/extensions/struts2/plugin/build.xml
/trunk/extensions/struts2/plugin/pom.xml
/trunk/extensions/struts2/plugin/src
/trunk/extensions/struts2/plugin/struts2-plugin.iml
/trunk/lifecycle
/trunk/servlet
/trunk/spring
/trunk/struts2
Modified:
/trunk/build.xml
/trunk/extensions/lifecycle/build.properties
/trunk/extensions/lifecycle/build.xml
/trunk/extensions/servlet/build.properties
/trunk/extensions/servlet/build.xml
/trunk/extensions/spring/build.properties
/trunk/extensions/spring/build.xml
=======================================
--- /dev/null
+++ /trunk/extensions/struts2/build.properties Sat Aug 21 16:50:30 2010
@@ -0,0 +1,6 @@
+lib.dir=../../lib
+ext.lib.dir=lib
+src.dir=src
+build.dir=build
+module=com.google.inject.struts2
+fragment=true
=======================================
--- /dev/null
+++ /trunk/extensions/struts2/build.xml Sat Aug 21 16:50:30 2010
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<project name="guice-struts2-plugin" basedir="." default="jar">
+
+ <import file="../../common.xml"/>
+
+ <path id="compile.classpath">
+ <fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="${ext.lib.dir}" includes="*.jar"/>
+ <fileset dir="../../build/dist" includes="*.jar"/>
+ <fileset dir="../servlet/build" includes="*.jar"/>
+ </path>
+
+ <target name="jar" depends="jar.withdeps, manifest" description="Build
jar.">
+ <jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
+ manifest="${build.dir}/META-INF/MANIFEST.MF">
+ <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
+ excludes="com/google/inject/internal/**"/>
+ </jar>
+ </target>
+
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/struts2/pom.xml Sat Aug 21 16:50:30 2010
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>guice-struts2-plugin</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: Struts2 Plugin</name>
+ <description>Guice integration with Struts2 as a plugin</description>
+ <!-- Note: this pom is for dependency management only. It will not
build the project -->
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ </dependencies>
+</project>
=======================================
--- /dev/null
+++ /trunk/extensions/struts2/struts2-plugin.iml Sat Aug 21 16:50:30 2010
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="guice" />
+ <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/jetty-util-6.1.0.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>
+ <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/commons-logging-1.0.4.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-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/xwork-2.0.0.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/jetty-6.1.0.jar!/" />
+ </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/core-3.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="servlet" />
+ </component>
+</module>
+
=======================================
--- /trunk/struts2/plugin/build.properties Sun May 9 05:48:24 2010
+++ /dev/null
@@ -1,5 +0,0 @@
-lib.dir=../lib
-src.dir=src
-build.dir=build
-module=com.google.inject.struts2
-fragment=true
=======================================
--- /trunk/struts2/plugin/build.xml Sat Nov 29 12:45:55 2008
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="guice-struts2-plugin" basedir="." default="jar">
-
- <import file="../../common.xml"/>
-
- <path id="compile.classpath">
- <fileset dir="${lib.dir}" includes="*.jar"/>
- <fileset dir="../../build/dist" includes="*.jar"/>
- <fileset dir="../../servlet/build" includes="*.jar"/>
- </path>
-
- <target name="jar" depends="jar.withdeps, manifest" description="Build
jar.">
- <jar destfile="${build.dir}/${ant.project.name}-${version}.jar"
- manifest="${build.dir}/META-INF/MANIFEST.MF">
- <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"
- excludes="com/google/inject/internal/**"/>
- </jar>
- </target>
-
-</project>
=======================================
--- /trunk/struts2/plugin/pom.xml Sun Aug 1 12:55:08 2010
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>extensions-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
- <artifactId>guice-struts2-plugin</artifactId>
- <packaging>jar</packaging>
- <name>Google Guice - Extension: Struts2 Plugin</name>
- <description>Guice integration with Struts2 as a plugin</description>
- <!-- Note: this pom is for dependency management only. It will not
build the project -->
- <dependencies>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-servlet</artifactId>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>xwork</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.0.5</version>
- </dependency>
- </dependencies>
-</project>
=======================================
--- /trunk/struts2/plugin/struts2-plugin.iml Fri Feb 20 16:25:27 2009
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="guice" />
- <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/jetty-util-6.1.0.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>
- <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/commons-logging-1.0.4.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-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/xwork-2.0.0.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/jetty-6.1.0.jar!/" />
- </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/core-3.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module" module-name="servlet" />
- </component>
-</module>
-
=======================================
--- /trunk/build.xml Sun May 9 05:48:24 2010
+++ /trunk/build.xml Sat Aug 21 16:50:30 2010
@@ -19,9 +19,9 @@
<target name="dist" depends="distjars, javadoc"
description="Build entire distribution.">
- <ant antfile="servlet/build.xml" target="distjars" inheritAll="false"/>
- <ant antfile="spring/build.xml" target="distjars" inheritAll="false"/>
- <ant antfile="struts2/plugin/build.xml" target="distjars"
inheritAll="false"/>
+ <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"/>
@@ -29,13 +29,13 @@
<ant antfile="extensions/multibindings/build.xml" target="distjars"
inheritAll="false"/>
<copy toDir="${build.dir}/dist">
- <fileset dir="servlet/build" includes="*.jar"
excludes="*-with-deps.jar"/>
+ <fileset dir="extensions/servlet/build" includes="*.jar"
excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="spring/build" includes="*.jar"
excludes="*-with-deps.jar"/>
+ <fileset dir="extensions/spring/build" includes="*.jar"
excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
- <fileset dir="struts2/plugin/build" includes="*.jar"
excludes="*-with-deps.jar"/>
+ <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"/>
@@ -196,9 +196,9 @@
<target name="clean.all"
depends="clean"
description="Remove generated files.">
- <ant dir="servlet" antfile="build.xml" target="clean"/>
- <ant dir="spring" antfile="build.xml" target="clean"/>
- <ant dir="struts2/plugin" antfile="build.xml" target="clean"/>
+ <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/lifecycle/build.properties Sun May 9 05:48:24 2010
+++ /trunk/extensions/lifecycle/build.properties Sat Aug 21 16:50:30 2010
@@ -1,3 +1,4 @@
+lib.dir=../../lib
src.dir=src
test.dir=test
build.dir=build
=======================================
--- /trunk/lifecycle/build.xml Fri Sep 4 02:08:15 2009
+++ /trunk/extensions/lifecycle/build.xml Sat Aug 21 16:50:30 2010
@@ -2,12 +2,12 @@
<project name="guice-lifecycle" basedir="." default="jar">
- <import file="../common.xml"/>
+ <import file="../../common.xml"/>
<path id="compile.classpath">
- <fileset dir="../lib" includes="*.jar"/>
- <fileset dir="../lib/build" includes="*.jar"/>
- <fileset dir="../build/dist" includes="*.jar"/>
+ <fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="${lib.dir}/build" includes="*.jar"/>
+ <fileset dir="../../build/dist" includes="*.jar"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build
jar.">
=======================================
--- /trunk/servlet/build.properties Sun May 9 05:48:24 2010
+++ /trunk/extensions/servlet/build.properties Sat Aug 21 16:50:30 2010
@@ -1,4 +1,5 @@
-lib.dir=lib
+lib.dir=../../lib
+ext.lib.dir=lib
src.dir=src
test.dir=test
build.dir=build
=======================================
--- /trunk/servlet/build.xml Sun Dec 21 03:31:25 2008
+++ /trunk/extensions/servlet/build.xml Sat Aug 21 16:50:30 2010
@@ -2,14 +2,14 @@
<project name="guice-servlet" basedir="." default="jar">
- <import file="../common.xml"/>
+ <import file="../../common.xml"/>
<path id="compile.classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
<fileset dir="${lib.dir}/build" includes="*.jar"/>
- <fileset dir="../lib" includes="*.jar"/>
- <fileset dir="../lib/build" includes="*.jar"/>
- <fileset dir="../build/dist" includes="*.jar"/>
+ <fileset dir="${ext.lib.dir}" includes="*.jar"/>
+ <fileset dir="${ext.lib.dir}/build" includes="*.jar"/>
+ <fileset dir="../../build/dist" includes="*.jar"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build
jar.">
=======================================
--- /trunk/spring/build.properties Sun May 9 05:48:24 2010
+++ /trunk/extensions/spring/build.properties Sat Aug 21 16:50:30 2010
@@ -1,3 +1,4 @@
+lib.dir=../../lib
src.dir=src
test.dir=test
build.dir=build
=======================================
--- /trunk/spring/build.xml Sat Nov 29 12:45:55 2008
+++ /trunk/extensions/spring/build.xml Sat Aug 21 16:50:30 2010
@@ -2,12 +2,12 @@
<project name="guice-spring" basedir="." default="jar">
- <import file="../common.xml"/>
+ <import file="../../common.xml"/>
<path id="compile.classpath">
- <fileset dir="../lib" includes="*.jar"/>
- <fileset dir="../lib/build" includes="*.jar"/>
- <fileset dir="../build/dist" includes="*.jar"/>
+ <fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="${lib.dir}/build" includes="*.jar"/>
+ <fileset dir="../../build/dist" includes="*.jar"/>
</path>
<target name="jar" depends="jar.withdeps, manifest" description="Build
jar.">
--
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.
