Author: limpbizkit
Date: Tue May 19 11:18:03 2009
New Revision: 976

Added:
    trunk/extensions/jmx/jmx.iml
    trunk/extensions/jndi/jndi.iml
Modified:
     
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/package-info.java
    trunk/extensions/jmx/src/com/google/inject/tools/jmx/package-info.java
    trunk/extensions/jndi/build.xml
    trunk/extensions/jndi/src/com/google/inject/jndi/package-info.java
     
trunk/extensions/multibindings/src/com/google/inject/multibindings/package-info.java
     
trunk/extensions/throwingproviders/src/com/google/inject/throwingproviders/package-info.java
    trunk/guice.ipr
    trunk/servlet/src/com/google/inject/servlet/package-info.java
    trunk/spring/src/com/google/inject/spring/package-info.java

Log:
Adding notes to package-info pointing at the required .jar files.
Adding IntelliJ modules for JMX and JNDI.
Fixing the broken JNDI build.

Modified:  
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/package-info.java
==============================================================================
---  
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/package-info.java
   
(original)
+++  
trunk/extensions/assistedinject/src/com/google/inject/assistedinject/package-info.java
   
Tue May 19 11:18:03 2009
@@ -15,6 +15,7 @@
   */

  /**
- * Extension for combining factory interfaces with injection.
+ * Extension for combining factory interfaces with injection; this  
extension requires {...@code
+ * guice-jndi-2.0.jar}.
   */
  package com.google.inject.assistedinject;

Added: trunk/extensions/jmx/jmx.iml
==============================================================================
--- (empty file)
+++ trunk/extensions/jmx/jmx.iml        Tue May 19 11:18:03 2009
@@ -0,0 +1,13 @@
+<?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" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

Modified:  
trunk/extensions/jmx/src/com/google/inject/tools/jmx/package-info.java
==============================================================================
--- trunk/extensions/jmx/src/com/google/inject/tools/jmx/package-info.java      
 
(original)
+++ trunk/extensions/jmx/src/com/google/inject/tools/jmx/package-info.java      
 
Tue May 19 11:18:03 2009
@@ -15,6 +15,6 @@
   */

  /**
- * JMX integration
+ * JMX integration; this extension requires {...@code guice-jmx-2.0.jar}.
   */
  package com.google.inject.tools.jmx;

Modified: trunk/extensions/jndi/build.xml
==============================================================================
--- trunk/extensions/jndi/build.xml     (original)
+++ trunk/extensions/jndi/build.xml     Tue May 19 11:18:03 2009
@@ -1,6 +1,6 @@
  <?xml version="1.0"?>

-<project name="guice-jmx" basedir="." default="jar">
+<project name="guice-jndi" basedir="." default="jar">

    <import file="../../common.xml"/>


Added: trunk/extensions/jndi/jndi.iml
==============================================================================
--- (empty file)
+++ trunk/extensions/jndi/jndi.iml      Tue May 19 11:18:03 2009
@@ -0,0 +1,12 @@
+<?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" />
+  </component>
+</module>
+

Modified: trunk/extensions/jndi/src/com/google/inject/jndi/package-info.java
==============================================================================
--- trunk/extensions/jndi/src/com/google/inject/jndi/package-info.java   
(original)
+++ trunk/extensions/jndi/src/com/google/inject/jndi/package-info.java  Tue  
May 19 11:18:03 2009
@@ -15,6 +15,6 @@
   */

  /**
- * JNDI integration
+ * JNDI integration; this extension requires {...@code guice-jndi-2.0.jar}.
   */
  package com.google.inject.jndi;

Modified:  
trunk/extensions/multibindings/src/com/google/inject/multibindings/package-info.java
==============================================================================
---  
trunk/extensions/multibindings/src/com/google/inject/multibindings/package-info.java
     
(original)
+++  
trunk/extensions/multibindings/src/com/google/inject/multibindings/package-info.java
     
Tue May 19 11:18:03 2009
@@ -15,6 +15,7 @@
   */

  /**
- * Extension for binding multiple instances in a collection.
+ * Extension for binding multiple instances in a collection; this  
extension requires {...@code
+ * guice-multibindings-2.0.jar}.
   */
  package com.google.inject.multibindings;

Modified:  
trunk/extensions/throwingproviders/src/com/google/inject/throwingproviders/package-info.java
==============================================================================
---  
trunk/extensions/throwingproviders/src/com/google/inject/throwingproviders/package-info.java
     
(original)
+++  
trunk/extensions/throwingproviders/src/com/google/inject/throwingproviders/package-info.java
     
Tue May 19 11:18:03 2009
@@ -15,6 +15,7 @@
   */

  /**
- * Extension for injecting objects that may throw at provision time.
+ * Extension for injecting objects that may throw at provision time; this  
extension requires {...@code
+ * guice-throwingproviders-2.0.jar}.
   */
  package com.google.inject.throwingproviders;

Modified: trunk/guice.ipr
==============================================================================
--- trunk/guice.ipr     (original)
+++ trunk/guice.ipr     Tue May 19 11:18:03 2009
@@ -520,6 +520,8 @@
        <module  
fileurl="file://$PROJECT_DIR$/extensions/assistedinject/assistedinject.iml"  
filepath="$PROJECT_DIR$/extensions/assistedinject/assistedinject.iml" />
        <module  
fileurl="file://$PROJECT_DIR$/extensions/grapher/grapher.iml"  
filepath="$PROJECT_DIR$/extensions/grapher/grapher.iml" />
        <module fileurl="file://$PROJECT_DIR$/guice.iml"  
filepath="$PROJECT_DIR$/guice.iml" />
+      <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$/servlet/servlet.iml"  
filepath="$PROJECT_DIR$/servlet/servlet.iml" />
        <module fileurl="file://$PROJECT_DIR$/spring/spring.iml"  
filepath="$PROJECT_DIR$/spring/spring.iml" />

Modified: trunk/servlet/src/com/google/inject/servlet/package-info.java
==============================================================================
--- trunk/servlet/src/com/google/inject/servlet/package-info.java       
(original)
+++ trunk/servlet/src/com/google/inject/servlet/package-info.java       Tue May 
 
19 11:18:03 2009
@@ -15,9 +15,11 @@
   */

  /**
- * Servlet API scopes and bindings. Apply {...@link  
com.google.inject.servlet.GuiceFilter} to any
- * servlets which will use the servlet scopes. Install {...@link
- * com.google.inject.servlet.ServletModule} into your {...@link  
com.google.inject.Injector} to install
- * everything at once.
+ * Servlet API scopes, bindings and registration; this extension requires  
{...@code
+ * guice-servlet-2.0.jar}.
+ *
+ * <p>Apply {...@link com.google.inject.servlet.GuiceFilter} to any servlets  
which will use the servlet
+ * scopes. Install {...@link com.google.inject.servlet.ServletModule} into  
your {...@link
+ * com.google.inject.Injector} to install everything at once.
   */
  package com.google.inject.servlet;

Modified: trunk/spring/src/com/google/inject/spring/package-info.java
==============================================================================
--- trunk/spring/src/com/google/inject/spring/package-info.java (original)
+++ trunk/spring/src/com/google/inject/spring/package-info.java Tue May 19  
11:18:03 2009
@@ -15,6 +15,6 @@
   */

  /**
- * Spring integration
+ * Spring integration; this extension requires {...@code  
guice-spring-2.0.jar}.
   */
  package com.google.inject.spring;

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