Revision: 1052
Author: gk5885
Date: Fri Jul 31 15:28:50 2009
Log: Reflect feedback from the code review.


http://code.google.com/p/google-guice/source/detail?r=1052

Deleted:
  /branches/2.0-maven/integration-parent
Modified:
  /branches/2.0-maven/extensions/assistedinject/pom.xml
  /branches/2.0-maven/extensions/grapher/pom.xml
  /branches/2.0-maven/extensions/jmx/pom.xml
  /branches/2.0-maven/extensions/jndi/pom.xml
  /branches/2.0-maven/extensions/multibindings/pom.xml
  /branches/2.0-maven/extensions/pom.xml
  /branches/2.0-maven/extensions/throwingproviders/pom.xml
  /branches/2.0-maven/guice-parent/pom.xml
  /branches/2.0-maven/servlet/pom.xml
  /branches/2.0-maven/spring/pom.xml
  /branches/2.0-maven/struts2/plugin/pom.xml

=======================================
--- /branches/2.0-maven/extensions/assistedinject/pom.xml       Thu Jun 18  
09:45:19 2009
+++ /branches/2.0-maven/extensions/assistedinject/pom.xml       Fri Jul 31  
15:28:50 2009
@@ -3,11 +3,11 @@
      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.extension</groupId>
-    <artifactId>extension</artifactId>
+    <groupId>com.google.inject.extensions</groupId>
+    <artifactId>extensions-parent</artifactId>
      <version>2.0</version>
    </parent>
-  <artifactId>assisted-inject</artifactId>
+  <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>
=======================================
--- /branches/2.0-maven/extensions/grapher/pom.xml      Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/extensions/grapher/pom.xml      Fri Jul 31 15:28:50 2009
@@ -3,11 +3,11 @@
      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.extension</groupId>
-    <artifactId>extension</artifactId>
+    <groupId>com.google.inject.extensions</groupId>
+    <artifactId>extensions-parent</artifactId>
      <version>2.0</version>
    </parent>
-  <artifactId>grapher</artifactId>
+  <artifactId>guice-grapher</artifactId>
    <packaging>jar</packaging>
    <name>Google Guice - Extension: Grapher</name>
    <description>A tool to visualize Guice applications</description>
=======================================
--- /branches/2.0-maven/extensions/jmx/pom.xml  Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/extensions/jmx/pom.xml  Fri Jul 31 15:28:50 2009
@@ -3,11 +3,11 @@
      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.extension</groupId>
-    <artifactId>extension</artifactId>
+    <groupId>com.google.inject.extensions</groupId>
+    <artifactId>extensions-parent</artifactId>
      <version>2.0</version>
    </parent>
-  <artifactId>jmx</artifactId>
+  <artifactId>guice-jmx</artifactId>
    <packaging>jar</packaging>
    <name>Google Guice - Extension: JMX</name>
    <description>Tools for using Guice with Java Management  
Extensions</description>
=======================================
--- /branches/2.0-maven/extensions/jndi/pom.xml Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/extensions/jndi/pom.xml Fri Jul 31 15:28:50 2009
@@ -3,11 +3,11 @@
      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.extension</groupId>
-    <artifactId>extension</artifactId>
+    <groupId>com.google.inject.extensions</groupId>
+    <artifactId>extensions-parent</artifactId>
      <version>2.0</version>
    </parent>
-  <artifactId>jndi</artifactId>
+  <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>
=======================================
--- /branches/2.0-maven/extensions/multibindings/pom.xml        Thu Jun 18  
09:45:19 2009
+++ /branches/2.0-maven/extensions/multibindings/pom.xml        Fri Jul 31  
15:28:50 2009
@@ -3,11 +3,11 @@
      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.extension</groupId>
-    <artifactId>extension</artifactId>
+    <groupId>com.google.inject.extensions</groupId>
+    <artifactId>extensions-parent</artifactId>
      <version>2.0</version>
    </parent>
-  <artifactId>multibindings</artifactId>
+  <artifactId>guice-multibindings</artifactId>
    <packaging>jar</packaging>
    <name>Google Guice - Extension: Multibindings</name>
    <description>Tools injecting collections of bound values</description>
=======================================
--- /branches/2.0-maven/extensions/pom.xml      Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/extensions/pom.xml      Fri Jul 31 15:28:50 2009
@@ -7,9 +7,24 @@
      <artifactId>guice-parent</artifactId>
      <version>2.0</version>
    </parent>
-  <groupId>com.google.inject.extension</groupId>
-  <artifactId>extension</artifactId>
+  <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>
=======================================
--- /branches/2.0-maven/extensions/throwingproviders/pom.xml    Thu Jun 18  
09:45:19 2009
+++ /branches/2.0-maven/extensions/throwingproviders/pom.xml    Fri Jul 31  
15:28:50 2009
@@ -3,11 +3,11 @@
      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.extension</groupId>
-    <artifactId>extension</artifactId>
+    <groupId>com.google.inject.extensions</groupId>
+    <artifactId>extensions-parent</artifactId>
      <version>2.0</version>
    </parent>
-  <artifactId>throwing-providers</artifactId>
+  <artifactId>guice-throwing-providers</artifactId>
    <packaging>jar</packaging>
    <name>Google Guice - Extension: Throwing Providers</name>
    <description>Providers that throw checked exceptions</description>
=======================================
--- /branches/2.0-maven/guice-parent/pom.xml    Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/guice-parent/pom.xml    Fri Jul 31 15:28:50 2009
@@ -54,15 +54,17 @@
      <url>http://code.google.com/p/google-guice/source/browse/</url>
    </scm>
    <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-        <inherited>true</inherited>
-      </plugin>
-    </plugins>
+    <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>
=======================================
--- /branches/2.0-maven/servlet/pom.xml Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/servlet/pom.xml Fri Jul 31 15:28:50 2009
@@ -3,13 +3,13 @@
      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.integration</groupId>
-    <artifactId>integration</artifactId>
+    <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 - Integration: Servlet</name>
+  <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>
=======================================
--- /branches/2.0-maven/spring/pom.xml  Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/spring/pom.xml  Fri Jul 31 15:28:50 2009
@@ -3,13 +3,13 @@
      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.integration</groupId>
-    <artifactId>integration</artifactId>
+    <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 - Integration: Spring</name>
+  <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>
@@ -20,8 +20,7 @@
      <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-beans</artifactId>
-      <version>2.0.2</version>
-      <scope>provided</scope>
+      <version>2.0.6</version>
      </dependency>
    </dependencies>
  </project>
=======================================
--- /branches/2.0-maven/struts2/plugin/pom.xml  Thu Jun 18 09:45:19 2009
+++ /branches/2.0-maven/struts2/plugin/pom.xml  Fri Jul 31 15:28:50 2009
@@ -3,13 +3,13 @@
      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.integration</groupId>
-    <artifactId>integration</artifactId>
+    <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 - Integration: Struts2 Plugin</name>
+  <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>
@@ -25,13 +25,11 @@
        <groupId>opensymphony</groupId>
        <artifactId>xwork</artifactId>
        <version>2.0.0</version>
-      <scope>provided</scope>
      </dependency>
      <dependency>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-core</artifactId>
        <version>2.0.5</version>
-      <scope>provided</scope>
      </dependency>
    </dependencies>
  </project>

--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to