Author: limpbizkit
Date: Mon May 18 17:58:48 2009
New Revision: 961
Added:
trunk/extensions/jmx/
trunk/extensions/jmx/build.properties
trunk/extensions/jmx/build.xml
trunk/extensions/jmx/src/
trunk/extensions/jmx/src/com/
trunk/extensions/jmx/src/com/google/
trunk/extensions/jmx/src/com/google/inject/
trunk/extensions/jmx/src/com/google/inject/tools/
trunk/extensions/jmx/src/com/google/inject/tools/jmx/
trunk/extensions/jmx/src/com/google/inject/tools/jmx/ManagedBinding.java
- copied unchanged from r936,
/trunk/src/com/google/inject/tools/jmx/ManagedBinding.java
trunk/extensions/jmx/src/com/google/inject/tools/jmx/ManagedBindingMBean.java
- copied unchanged from r936,
/trunk/src/com/google/inject/tools/jmx/ManagedBindingMBean.java
trunk/extensions/jmx/src/com/google/inject/tools/jmx/Manager.java
- copied unchanged from r936,
/trunk/src/com/google/inject/tools/jmx/Manager.java
trunk/extensions/jmx/src/com/google/inject/tools/jmx/package-info.java
- copied unchanged from r936,
/trunk/src/com/google/inject/tools/jmx/package-info.java
trunk/extensions/jmx/test/
trunk/extensions/jmx/test/com/
trunk/extensions/jmx/test/com/google/
trunk/extensions/jmx/test/com/google/inject/
trunk/extensions/jmx/test/com/google/inject/tools/
trunk/extensions/jmx/test/com/google/inject/tools/jmx/
trunk/extensions/jmx/test/com/google/inject/tools/jmx/JmxTest.java
- copied unchanged from r936,
/trunk/test/com/google/inject/tools/jmx/JmxTest.java
trunk/extensions/jndi/
trunk/extensions/jndi/build.properties
trunk/extensions/jndi/build.xml
trunk/extensions/jndi/src/
trunk/extensions/jndi/src/com/
trunk/extensions/jndi/src/com/google/
trunk/extensions/jndi/src/com/google/inject/
trunk/extensions/jndi/src/com/google/inject/jndi/
trunk/extensions/jndi/src/com/google/inject/jndi/JndiIntegration.java
- copied unchanged from r936,
/trunk/src/com/google/inject/jndi/JndiIntegration.java
trunk/extensions/jndi/src/com/google/inject/jndi/package-info.java
- copied unchanged from r936,
/trunk/src/com/google/inject/jndi/package-info.java
Removed:
trunk/src/com/google/inject/jndi/JndiIntegration.java
trunk/src/com/google/inject/jndi/package-info.java
trunk/src/com/google/inject/tools/jmx/ManagedBinding.java
trunk/src/com/google/inject/tools/jmx/ManagedBindingMBean.java
trunk/src/com/google/inject/tools/jmx/Manager.java
trunk/src/com/google/inject/tools/jmx/package-info.java
trunk/test/com/google/inject/tools/jmx/JmxTest.java
Modified:
trunk/build.properties
trunk/build.xml
Log:
Moving JNDI and JMX out to extensions/
Modified: trunk/build.properties
==============================================================================
--- trunk/build.properties (original)
+++ trunk/build.properties Mon May 18 17:58:48 2009
@@ -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,\
Modified: trunk/build.xml
==============================================================================
--- trunk/build.xml (original)
+++ trunk/build.xml Mon May 18 17:58:48 2009
@@ -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>
Added: trunk/extensions/jmx/build.properties
==============================================================================
--- (empty file)
+++ trunk/extensions/jmx/build.properties Mon May 18 17:58:48 2009
@@ -0,0 +1,5 @@
+lib.dir=../../lib
+src.dir=src
+test.dir=test
+build.dir=build
+module=com.google.inject.tools.jmx
Added: trunk/extensions/jmx/build.xml
==============================================================================
--- (empty file)
+++ trunk/extensions/jmx/build.xml Mon May 18 17:58:48 2009
@@ -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>
Added: trunk/extensions/jndi/build.properties
==============================================================================
--- (empty file)
+++ trunk/extensions/jndi/build.properties Mon May 18 17:58:48 2009
@@ -0,0 +1,5 @@
+lib.dir=../../lib
+src.dir=src
+test.dir=test
+build.dir=build
+module=com.google.inject.jndi
Added: trunk/extensions/jndi/build.xml
==============================================================================
--- (empty file)
+++ trunk/extensions/jndi/build.xml Mon May 18 17:58:48 2009
@@ -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>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
