Moving JNDI and JMX out to extensions/
git-svn-id: https://google-guice.googlecode.com/svn/trunk@961 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/build.properties b/build.properties
index 74f9ae4..5633756 100644
--- a/build.properties
+++ b/build.properties
@@ -4,13 +4,19 @@
servlet.src.dir=servlet/src
spring.src.dir=spring/src
assistedinject.src.dir=extensions/assistedinject/src
+jmx.src.dir=extensions/jmx/src
+jndi.src.dir=extensions/jndi/src
throwingproviders.src.dir=extensions/throwingproviders/src
multibindings.src.dir=extensions/multibindings/src
privatemodules.src.dir=extensions/privatemodules/src
build.dir=build
javadoc.packagenames=com.google.inject,com.google.inject.spi,\
- com.google.inject.matcher,com.google.inject.servlet,com.google.inject.name,\
- com.google.inject.tools.jmx,com.google.inject.binder,com.google.inject.jndi,\
+ com.google.inject.matcher,\
+ com.google.inject.servlet,\
+ com.google.inject.name,\
+ com.google.inject.tools.jmx,\
+ com.google.inject.binder,\
+ com.google.inject.jndi,\
com.google.inject.spring,\
com.google.inject.assistedinject,\
com.google.inject.throwingproviders,\
diff --git a/build.xml b/build.xml
index 3b778b6..c1609f9 100644
--- a/build.xml
+++ b/build.xml
@@ -26,6 +26,8 @@
<ant antfile="spring/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="struts2/plugin/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"/>
<ant antfile="extensions/throwingproviders/build.xml" target="distjars" inheritAll="false"/>
<ant antfile="extensions/multibindings/build.xml" target="distjars" inheritAll="false"/>
@@ -42,6 +44,12 @@
<fileset dir="extensions/assistedinject/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
+ <fileset dir="extensions/jmx/build" includes="*.jar" excludes="*-with-deps.jar"/>
+ </copy>
+ <copy toDir="${build.dir}/dist">
+ <fileset dir="extensions/jndi/build" includes="*.jar" excludes="*-with-deps.jar"/>
+ </copy>
+ <copy toDir="${build.dir}/dist">
<fileset dir="extensions/throwingproviders/build" includes="*.jar" excludes="*-with-deps.jar"/>
</copy>
<copy toDir="${build.dir}/dist">
@@ -101,6 +109,8 @@
<pathelement location="${servlet.src.dir}"/>
<pathelement location="${spring.src.dir}"/>
<pathelement location="${assistedinject.src.dir}"/>
+ <pathelement location="${jmx.src.dir}"/>
+ <pathelement location="${jndi.src.dir}"/>
<pathelement location="${throwingproviders.src.dir}"/>
<pathelement location="${multibindings.src.dir}"/>
</sourcepath>
@@ -156,6 +166,8 @@
<ant dir="spring" antfile="build.xml" target="clean"/>
<ant dir="struts2/plugin" 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"/>
<ant dir="extensions/throwingproviders" antfile="build.xml" target="clean"/>
<ant dir="extensions/multibindings" antfile="build.xml" target="clean"/>
</target>
diff --git a/extensions/jmx/build.properties b/extensions/jmx/build.properties
new file mode 100644
index 0000000..5d1f8ba
--- /dev/null
+++ b/extensions/jmx/build.properties
@@ -0,0 +1,5 @@
+lib.dir=../../lib
+src.dir=src
+test.dir=test
+build.dir=build
+module=com.google.inject.tools.jmx
diff --git a/extensions/jmx/build.xml b/extensions/jmx/build.xml
new file mode 100644
index 0000000..ea50b7d
--- /dev/null
+++ b/extensions/jmx/build.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<project name="guice-jmx" basedir="." default="jar">
+
+ <import file="../../common.xml"/>
+
+ <path id="compile.classpath">
+ <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.">
+ <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>
diff --git a/src/com/google/inject/tools/jmx/ManagedBinding.java b/extensions/jmx/src/com/google/inject/tools/jmx/ManagedBinding.java
similarity index 100%
rename from src/com/google/inject/tools/jmx/ManagedBinding.java
rename to extensions/jmx/src/com/google/inject/tools/jmx/ManagedBinding.java
diff --git a/src/com/google/inject/tools/jmx/ManagedBindingMBean.java b/extensions/jmx/src/com/google/inject/tools/jmx/ManagedBindingMBean.java
similarity index 100%
rename from src/com/google/inject/tools/jmx/ManagedBindingMBean.java
rename to extensions/jmx/src/com/google/inject/tools/jmx/ManagedBindingMBean.java
diff --git a/src/com/google/inject/tools/jmx/Manager.java b/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java
similarity index 100%
rename from src/com/google/inject/tools/jmx/Manager.java
rename to extensions/jmx/src/com/google/inject/tools/jmx/Manager.java
diff --git a/src/com/google/inject/tools/jmx/package-info.java b/extensions/jmx/src/com/google/inject/tools/jmx/package-info.java
similarity index 100%
rename from src/com/google/inject/tools/jmx/package-info.java
rename to extensions/jmx/src/com/google/inject/tools/jmx/package-info.java
diff --git a/test/com/google/inject/tools/jmx/JmxTest.java b/extensions/jmx/test/com/google/inject/tools/jmx/JmxTest.java
similarity index 100%
rename from test/com/google/inject/tools/jmx/JmxTest.java
rename to extensions/jmx/test/com/google/inject/tools/jmx/JmxTest.java
diff --git a/extensions/jndi/build.properties b/extensions/jndi/build.properties
new file mode 100644
index 0000000..bc0b789
--- /dev/null
+++ b/extensions/jndi/build.properties
@@ -0,0 +1,5 @@
+lib.dir=../../lib
+src.dir=src
+test.dir=test
+build.dir=build
+module=com.google.inject.jndi
diff --git a/extensions/jndi/build.xml b/extensions/jndi/build.xml
new file mode 100644
index 0000000..ea50b7d
--- /dev/null
+++ b/extensions/jndi/build.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<project name="guice-jmx" basedir="." default="jar">
+
+ <import file="../../common.xml"/>
+
+ <path id="compile.classpath">
+ <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.">
+ <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>
diff --git a/src/com/google/inject/jndi/JndiIntegration.java b/extensions/jndi/src/com/google/inject/jndi/JndiIntegration.java
similarity index 100%
rename from src/com/google/inject/jndi/JndiIntegration.java
rename to extensions/jndi/src/com/google/inject/jndi/JndiIntegration.java
diff --git a/src/com/google/inject/jndi/package-info.java b/extensions/jndi/src/com/google/inject/jndi/package-info.java
similarity index 100%
rename from src/com/google/inject/jndi/package-info.java
rename to extensions/jndi/src/com/google/inject/jndi/package-info.java