cziegeler 02/01/31 02:16:26
Modified: . build.xml
src/java/org/apache/cocoon/i18n
XMLResourceBundleFactory.java
Log:
Submitted patch by Konstantin Piroumian and fixed dist target.
PR:#6145
Revision Changes Path
1.151 +2 -6 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- build.xml 31 Jan 2002 00:26:08 -0000 1.150
+++ build.xml 31 Jan 2002 10:16:26 -0000 1.151
@@ -176,7 +176,6 @@
<property name="java.dir" value="${src.dir}/java"/>
<property name="test.dir" value="${src.dir}/test"/>
<property name="lib.dir" value="./lib"/>
- <property name="bin.dir" value="./bin"/>
<property name="tools.dir" value="./tools"/>
<property name="docs.dir" value="${src.dir}/documentation/xdocs"/>
<property name="images.dir" value="${src.dir}/documentation/images"/>
@@ -938,7 +937,7 @@
<exclude name="**/*.gif"/>
<exclude name="**/*.jpg"/>
<exclude name="**/*.png"/>
- <exclude name="**/i18n/*"/>
+ <exclude name="**/i18n/**"/>
<exclude name="**/db/*"/>
</fileset>
</copy>
@@ -948,7 +947,7 @@
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
- <include name="**/i18n/*"/>
+ <include name="**/i18n/**"/>
<include name="**/db/*"/>
</fileset>
</copy>
@@ -1243,9 +1242,6 @@
<mkdir dir="${dist.src.dir}/docs/apidocs"/>
<mkdir dir="${dist.src.dir}/tools"/>
- <copy todir="${dist.src.dir}/bin">
- <fileset dir="${bin.dir}"/>
- </copy>
<copy todir="${dist.src.dir}/tools">
<fileset dir="${tools.dir}"/>
</copy>
1.3 +11 -2
xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Index: XMLResourceBundleFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLResourceBundleFactory.java 8 Jan 2002 05:44:54 -0000 1.2
+++ XMLResourceBundleFactory.java 31 Jan 2002 10:16:26 -0000 1.3
@@ -22,7 +22,9 @@
import org.apache.log.Logger;
import org.xml.sax.SAXParseException;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -33,7 +35,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Engelhart</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Neeme Praks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Oleg Podolsky</a>
- * @version $Id: XMLResourceBundleFactory.java,v 1.2 2002/01/08 05:44:54 vgritsenko
Exp $
+ * @version $Id: XMLResourceBundleFactory.java,v 1.3 2002/01/31 10:16:26 cziegeler
Exp $
*/
public class XMLResourceBundleFactory
@@ -74,7 +76,14 @@
}
public void dispose() {
- // FIXME: Need to go through all bundles and call dispose() on them
+ Collection bundles = getComponentMap().values();
+ Iterator i = bundles.iterator();
+ while (i.hasNext()) {
+ Object bundle = i.next();
+ if (bundle instanceof Disposable) {
+ ((Disposable)bundle).dispose();
+ }
+ }
this.manager = null;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
