diff -r c87f46480999 j2ee.dd/nbproject/project.xml
--- a/j2ee.dd/nbproject/project.xml	Mon Jan 24 16:06:49 2011 +0100
+++ b/j2ee.dd/nbproject/project.xml	Mon Jan 24 16:14:04 2011 +0100
@@ -184,11 +184,35 @@
                 <test-type>
                     <name>unit</name>
                     <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
+                        <recursive/>
+                    </test-dependency>
+                    <test-dependency>
                         <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
                         <recursive/>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
+                        <code-name-base>org.netbeans.modules.j2ee.metadata.model.support</code-name-base>
+                        <compile-dependency/>
+                        <test/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.masterfs</code-name-base>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.projectui</code-name-base>
+                    </test-dependency>
+                    <test-dependency>
                         <code-name-base>org.openide.text</code-name-base>
                     </test-dependency>
                     <test-dependency>
@@ -201,21 +225,6 @@
                         <compile-dependency/>
                         <test/>
                     </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.j2ee.metadata.model.support</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.masterfs</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
-                        <recursive/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectui</code-name-base>
-                    </test-dependency>
                 </test-type>
             </test-dependencies>
             <public-packages>
diff -r c87f46480999 j2ee.dd/test/unit/data/application/application1.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/j2ee.dd/test/unit/data/application/application1.xml	Mon Jan 24 16:14:04 2011 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+  <display-name>EnterpriseApplication10</display-name>
+  <module>
+    <web>
+      <web-uri>EnterpriseApplication10-war.war</web-uri>
+      <context-root>/EnterpriseApplication10-war</context-root>
+    </web>
+  </module>
+</application>
diff -r c87f46480999 j2ee.dd/test/unit/data/application/application2.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/j2ee.dd/test/unit/data/application/application2.xml	Mon Jan 24 16:14:04 2011 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+  <display-name>EnterpriseApplication10</display-name>
+  <module>
+    <web>
+      <web-uri>EnterpriseApplication10-war.war</web-uri>
+      <context-root>/EnterpriseApplication10-war</context-root>
+    </web>
+  </module>
+  <module>
+    <web>
+      <web-uri>WebApplication9.war</web-uri>
+      <context-root>/WebApplication9</context-root>
+    </web>
+  </module>
+</application>
\ No newline at end of file
diff -r c87f46480999 j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/application/DDApiTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/application/DDApiTest.java	Mon Jan 24 16:14:04 2011 +0100
@@ -0,0 +1,100 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2011 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.j2ee.dd.api.application;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.netbeans.junit.*;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
+/**
+ *
+ * @author Petr Hejl
+ */
+public class DDApiTest extends NbTestCase {
+
+    public DDApiTest(String name) {
+        super(name);
+    }
+
+    public void testChange() throws Exception {
+        File baseDir = getWorkDir();
+        File dataDir = getDataDir();
+        
+        File original = new File(dataDir, "application/application1.xml");
+        File updated = new File(dataDir, "application/application2.xml");
+        
+        File working = new File(baseDir, "application.xml");
+        copy(original, working);
+        
+        FileObject workingObject = FileUtil.toFileObject(FileUtil.normalizeFile(working));
+        
+        Application app = DDProvider.getDefault().getDDRoot(workingObject);
+        assertEquals(1, app.getModule().length);
+        
+        copy(updated, working);
+        FileUtil.refreshFor(working);
+        app = DDProvider.getDefault().getDDRoot(workingObject);
+        assertEquals(2, app.getModule().length);
+    }
+    
+    private void copy(File source, File dest) throws Exception {
+        InputStream is = new BufferedInputStream(new FileInputStream(source));
+        try {
+            OutputStream os = new BufferedOutputStream(new FileOutputStream(dest));
+            try {
+                FileUtil.copy(is, os);
+            } finally {
+                os.close();
+            }
+        } finally {
+            is.close();
+        }
+    }
+}
\ No newline at end of file