Merge 2.0-maven branch into trunk.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1199 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/extensions/assistedinject/pom.xml b/extensions/assistedinject/pom.xml
new file mode 100644
index 0000000..ac3240f
--- /dev/null
+++ b/extensions/assistedinject/pom.xml
@@ -0,0 +1,21 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-assisted-inject</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: Assisted Inject</name>
+ <description>An easier way to help the Guice Injector build objects</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>
+ </dependencies>
+</project>
diff --git a/extensions/grapher/pom.xml b/extensions/grapher/pom.xml
new file mode 100644
index 0000000..6b3f2f7
--- /dev/null
+++ b/extensions/grapher/pom.xml
@@ -0,0 +1,21 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-grapher</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: Grapher</name>
+ <description>A tool to visualize Guice applications</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>
+ </dependencies>
+</project>
diff --git a/extensions/jmx/pom.xml b/extensions/jmx/pom.xml
new file mode 100644
index 0000000..5aeeb44
--- /dev/null
+++ b/extensions/jmx/pom.xml
@@ -0,0 +1,21 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-jmx</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: JMX</name>
+ <description>Tools for using Guice with Java Management Extensions</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>
+ </dependencies>
+</project>
diff --git a/extensions/jndi/pom.xml b/extensions/jndi/pom.xml
new file mode 100644
index 0000000..2d984b3
--- /dev/null
+++ b/extensions/jndi/pom.xml
@@ -0,0 +1,21 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-jndi</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: JNDI</name>
+ <description>Tools for using Guice with the Java Naming and Directory Interface</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>
+ </dependencies>
+</project>
diff --git a/extensions/multibindings/pom.xml b/extensions/multibindings/pom.xml
new file mode 100644
index 0000000..cabdb2a
--- /dev/null
+++ b/extensions/multibindings/pom.xml
@@ -0,0 +1,21 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-multibindings</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: Multibindings</name>
+ <description>Tools injecting collections of bound values</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>
+ </dependencies>
+</project>
diff --git a/extensions/pom.xml b/extensions/pom.xml
new file mode 100644
index 0000000..6442a75
--- /dev/null
+++ b/extensions/pom.xml
@@ -0,0 +1,30 @@
+<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</groupId>
+ <artifactId>guice-parent</artifactId>
+ <version>2.0</version>
+ </parent>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>extensions-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Google Guice - Extensions</name>
+ <description>A collection of extensions to Guice</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git a/extensions/throwingproviders/pom.xml b/extensions/throwingproviders/pom.xml
new file mode 100644
index 0000000..f6e5b66
--- /dev/null
+++ b/extensions/throwingproviders/pom.xml
@@ -0,0 +1,21 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-throwing-providers</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extension: Throwing Providers</name>
+ <description>Providers that throw checked exceptions</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>
+ </dependencies>
+</project>
diff --git a/guice-parent/pom.xml b/guice-parent/pom.xml
new file mode 100644
index 0000000..b6a5937
--- /dev/null
+++ b/guice-parent/pom.xml
@@ -0,0 +1,70 @@
+<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</groupId>
+ <artifactId>google</artifactId>
+ <version>1</version>
+ </parent>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>2.0</version>
+ <name>Google Guice</name>
+ <description>Guice (pronounced 'juice') is a lightweight dependency injection
+ framework for Java 5 and above, brought to you by Google.</description>
+ <url>http://code.google.com/p/google-guice/</url>
+ <inceptionYear>2006</inceptionYear>
+ <issueManagement>
+ <system>Google Code</system>
+ <url>http://code.google.com/p/google-guice/issues/</url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>google-guice</name>
+ <archive>http://groups.google.com/group/google-guice/topics</archive>
+ <subscribe>http://groups.google.com/group/google-guice/subscribe</subscribe>
+ <unsubscribe>http://groups.google.com/group/google-guice/subscribe</unsubscribe>
+ <post>http://groups.google.com/group/google-guice/post</post>
+ </mailingList>
+ <mailingList>
+ <name>google-guice-dev</name>
+ <archive>http://groups.google.com/group/google-guice-dev/topics</archive>
+ <subscribe>http://groups.google.com/group/google-guice-dev/subscribe</subscribe>
+ <unsubscribe>http://groups.google.com/group/google-guice-dev/subscribe</unsubscribe>
+ <post>http://groups.google.com/group/google-guice-dev/post</post>
+ </mailingList>
+ </mailingLists>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <scm>
+ <url>http://code.google.com/p/google-guice/source/browse/</url>
+ </scm>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 72d149d..6be83e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,30 +1,20 @@
-<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">
+<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>
- <groupId>com.google.inject</groupId>
+ <parent>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice-parent</artifactId>
+ <version>2.0</version>
+ </parent>
<artifactId>guice</artifactId>
<packaging>jar</packaging>
- <version>1.0-RC2</version>
- <name>guice</name>
- <url>http://maven.apache.org</url>
+ <!-- Note: this pom is for dependency management only. It will not build the project -->
<dependencies>
+ <!-- CGLib is not listed because it has been repackaged with JarJar -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/servlet/pom.xml b/servlet/pom.xml
new file mode 100644
index 0000000..cff86e4
--- /dev/null
+++ b/servlet/pom.xml
@@ -0,0 +1,25 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-servlet</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extensions: Servlet</name>
+ <description>Guice integration with servlets</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>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring/pom.xml b/spring/pom.xml
new file mode 100644
index 0000000..f084b46
--- /dev/null
+++ b/spring/pom.xml
@@ -0,0 +1,26 @@
+<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>2.0</version>
+ </parent>
+ <artifactId>guice-spring</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extensions: Spring</name>
+ <description>Guice integration with the Spring container</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>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/struts2/plugin/pom.xml b/struts2/plugin/pom.xml
new file mode 100644
index 0000000..00ba6dc
--- /dev/null
+++ b/struts2/plugin/pom.xml
@@ -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>2.0</version>
+ </parent>
+ <artifactId>guice-struts2-plugin</artifactId>
+ <packaging>jar</packaging>
+ <name>Google Guice - Extensions: 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>