Automated merge with https://hg.netbeans.org/qa-main
authorVojtech Sigler <vsigler@netbeans.org>
Mon, 27 Apr 2009 11:06:08 +0200
changeset 28808291a2ba6d0b
parent 2870 769428044ef5
parent 2879 cbff8ebffc96
child 2881 812a0e7e2dc9
Automated merge with https://hg.netbeans.org/qa-main
     1.1 --- a/visualweb.ejb/nbproject/project.xml	Thu Apr 23 12:53:47 2009 +0400
     1.2 +++ b/visualweb.ejb/nbproject/project.xml	Mon Apr 27 11:06:08 2009 +0200
     1.3 @@ -238,30 +238,34 @@
     1.4                  <test-type>
     1.5                      <name>qa-functional</name>
     1.6                      <test-dependency>
     1.7 +                        <code-name-base>org.netbeans.modules.jellytools</code-name-base>
     1.8 +                        <compile-dependency/>
     1.9 +                    </test-dependency>
    1.10 +                    <test-dependency>
    1.11 +                        <code-name-base>org.netbeans.modules.jellytools.ide</code-name-base>
    1.12 +                        <compile-dependency/>
    1.13 +                    </test-dependency>
    1.14 +                    <test-dependency>
    1.15 +                        <code-name-base>org.netbeans.modules.jellytools.platform</code-name-base>
    1.16 +                        <compile-dependency/>
    1.17 +                    </test-dependency>
    1.18 +                    <test-dependency>
    1.19                          <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
    1.20                          <recursive/>
    1.21                          <compile-dependency/>
    1.22                      </test-dependency>
    1.23                      <test-dependency>
    1.24 +                        <code-name-base>org.netbeans.modules.visualweb.ejb</code-name-base>
    1.25 +                        <compile-dependency/>
    1.26 +                    </test-dependency>
    1.27 +                    <test-dependency>
    1.28                          <code-name-base>org.netbeans.modules.visualweb.gravy</code-name-base>
    1.29                          <compile-dependency/>
    1.30                      </test-dependency>
    1.31                      <test-dependency>
    1.32 -                        <code-name-base>org.netbeans.modules.visualweb.ejb</code-name-base>
    1.33 -                        <compile-dependency/>
    1.34 -                    </test-dependency>
    1.35 -                    <test-dependency>
    1.36                          <code-name-base>org.netbeans.modules.visualweb.insync</code-name-base>
    1.37                          <compile-dependency/>
    1.38                      </test-dependency>
    1.39 -                    <test-dependency>
    1.40 -                        <code-name-base>org.netbeans.modules.jellytools</code-name-base>
    1.41 -                        <compile-dependency/>
    1.42 -                    </test-dependency>
    1.43 -                    <test-dependency>
    1.44 -                        <code-name-base>org.netbeans.modules.jellytools.platform</code-name-base>
    1.45 -                        <compile-dependency/>
    1.46 -                    </test-dependency>
    1.47                  </test-type>
    1.48              </test-dependencies>
    1.49              <public-packages/>
     2.1 --- a/visualweb.kit/nbproject/project.xml	Thu Apr 23 12:53:47 2009 +0400
     2.2 +++ b/visualweb.kit/nbproject/project.xml	Mon Apr 27 11:06:08 2009 +0200
     2.3 @@ -333,15 +333,15 @@
     2.4                          <compile-dependency/>
     2.5                      </test-dependency>
     2.6                      <test-dependency>
     2.7 -                        <code-name-base>org.netbeans.modules.visualweb.gravy</code-name-base>
     2.8 -                        <compile-dependency/>
     2.9 -                    </test-dependency>
    2.10 -                    <test-dependency>
    2.11                          <code-name-base>org.netbeans.modules.jellytools</code-name-base>
    2.12                          <compile-dependency/>
    2.13                          <test/>
    2.14                      </test-dependency>
    2.15                      <test-dependency>
    2.16 +                        <code-name-base>org.netbeans.modules.jellytools.ide</code-name-base>
    2.17 +                        <compile-dependency/>
    2.18 +                    </test-dependency>
    2.19 +                    <test-dependency>
    2.20                          <code-name-base>org.netbeans.modules.jellytools.platform</code-name-base>
    2.21                          <compile-dependency/>
    2.22                      </test-dependency>
    2.23 @@ -355,6 +355,10 @@
    2.24                          <compile-dependency/>
    2.25                      </test-dependency>
    2.26                      <test-dependency>
    2.27 +                        <code-name-base>org.netbeans.modules.visualweb.gravy</code-name-base>
    2.28 +                        <compile-dependency/>
    2.29 +                    </test-dependency>
    2.30 +                    <test-dependency>
    2.31                          <code-name-base>org.openide.util</code-name-base>
    2.32                          <compile-dependency/>
    2.33                      </test-dependency>