diff -r 0fd27995241b -r 9ac0a0a7da70 javacommons/utils/build/build.xml
--- a/javacommons/utils/build/build.xml	Tue May 11 16:07:20 2010 +0300
+++ b/javacommons/utils/build/build.xml	Tue May 25 12:34:19 2010 +0300
@@ -44,39 +44,7 @@
   <!-- Setting all classes to be visible to everybody -->
   <target name="create.internal.api.jar">
     <omj.internal.apis includes=
-                 "com/nokia/mj/impl/utils/Attribute.class,
-                  com/nokia/mj/impl/utils/AttributeReader.class,
-                  com/nokia/mj/impl/utils/Base64.class,
-                  com/nokia/mj/impl/utils/BufferedReader.class,
-                  com/nokia/mj/impl/utils/DebugUtils.class,
-                  com/nokia/mj/impl/utils/ErrorMessageBase.class,
-                  com/nokia/mj/impl/utils/Formatter.class,
-                  com/nokia/mj/impl/utils/InstallerDetailedErrorMessage.class,
-                  com/nokia/mj/impl/utils/InstallerErrorMessage.class,
-                  com/nokia/mj/impl/utils/JadReader.class,
-                  com/nokia/mj/impl/utils/JarManifestReader.class,
-                  com/nokia/mj/impl/utils/JavaLanguageSyntaxChecker.class,
-                  com/nokia/mj/impl/utils/LineReader.class,
-                  com/nokia/mj/impl/utils/LocalizedTextProvider.class,
-                  com/nokia/mj/impl/utils/Logger.class,
-                  com/nokia/mj/impl/utils/ManifestReader.class,
-                  com/nokia/mj/impl/utils/MidpAttributeValidator.class,
-                  com/nokia/mj/impl/utils/OsErrorMessage.class,
-                  com/nokia/mj/impl/utils/OtaStatusCode.class,
-                  com/nokia/mj/impl/utils/ResourceLoader.class,
-                  com/nokia/mj/impl/utils/ResourceUtil.class,
-                  com/nokia/mj/impl/utils/StartUpTrace.class,
-                  com/nokia/mj/impl/utils/StreamUtils.class,
-                  com/nokia/mj/impl/utils/Task.class,
-                  com/nokia/mj/impl/utils/TaskQueue.class,
-                  com/nokia/mj/impl/utils/TextUtil.class,
-                  com/nokia/mj/impl/utils/Tokenizer.class,
-                  com/nokia/mj/impl/utils/Uid.class,
-                  com/nokia/mj/impl/utils/Version.class,
-                  com/nokia/mj/impl/utils/exception/InvalidAttributeException.class,
-                  com/nokia/mj/impl/utils/exception/InstallerExceptionBase.class,
-                  com/nokia/mj/impl/utils/exception/ExceptionBase.class,
-                  com/nokia/mj/impl/utils/exception/UserCancelException.class,
+                 "com/nokia/mj/impl/utils/**/*.class,
                   com/nokia/mj/impl/rt/legacy/LegacySupport.class,
                   com/nokia/mj/impl/rt/support/ApplicationInfo.class,
                   com/nokia/mj/impl/rt/support/ApplicationUtils.class,