Automated merge with http://hg.netbeans.org/main/contrib/
authorJesse Glick <jglick@netbeans.org>
Thu, 15 Jul 2010 12:11:39 -0400
changeset 163538610f1a9b40c
parent 16351 013852611531
parent 16352 b69e0d8aae03
child 16355 5d05cd2af239
child 16358 5eb32a68d3e1
Automated merge with http://hg.netbeans.org/main/contrib/
     1.1 --- a/selenium/src/org/netbeans/modules/selenium/Selenium.xml	Wed Jul 14 15:09:12 2010 +0200
     1.2 +++ b/selenium/src/org/netbeans/modules/selenium/Selenium.xml	Thu Jul 15 12:11:39 2010 -0400
     1.3 @@ -10,14 +10,14 @@
     1.4      <localizing-bundle>org.netbeans.modules.selenium.Bundle</localizing-bundle>
     1.5      <volume>
     1.6          <type>classpath</type>
     1.7 -        <resource>jar:nbinst:///modules/ext/selenium/selenium-java-client-driver-1.0.1.jar!/</resource>
     1.8 +        <resource>jar:nbinst://org.netbeans.modules.selenium/modules/ext/selenium/selenium-java-client-driver-1.0.1.jar!/</resource>
     1.9      </volume>
    1.10      <volume>
    1.11          <type>src</type>
    1.12 -        <resource>jar:nbinst:///modules/ext/selenium/selenium-java-client-driver-sources-1.0.1.jar!</resource>
    1.13 +        <resource>jar:nbinst://org.netbeans.modules.selenium/modules/ext/selenium/selenium-java-client-driver-sources-1.0.1.jar!</resource>
    1.14      </volume>
    1.15      <volume>
    1.16          <type>javadoc</type>
    1.17 -        <resource>jar:nbinst:///modules/ext/selenium/selenium-java-client-driver-javadoc-1.0.1.zip!/</resource>
    1.18 +        <resource>jar:nbinst://org.netbeans.modules.selenium/modules/ext/selenium/selenium-java-client-driver-javadoc-1.0.1.zip!/</resource>
    1.19      </volume>
    1.20  </library>
     2.1 --- a/testng/src/org/netbeans/modules/contrib/testng/resources/TestNG-lib.xml	Wed Jul 14 15:09:12 2010 +0200
     2.2 +++ b/testng/src/org/netbeans/modules/contrib/testng/resources/TestNG-lib.xml	Thu Jul 15 12:11:39 2010 -0400
     2.3 @@ -47,14 +47,14 @@
     2.4      <localizing-bundle>org.netbeans.modules.contrib.testng.Bundle</localizing-bundle>
     2.5      <volume>
     2.6          <type>classpath</type>
     2.7 -        <resource>jar:nbinst:///modules/ext/testng/testng-5.11-jdk15.jar!/</resource>
     2.8 +        <resource>jar:nbinst://org.netbeans.modules.testng/modules/ext/testng/testng-5.11-jdk15.jar!/</resource>
     2.9      </volume>
    2.10      <volume>
    2.11          <type>src</type>
    2.12      </volume>
    2.13      <volume>
    2.14          <type>javadoc</type>
    2.15 -        <resource>jar:nbinst:///modules/ext/testng/TestNG-5.11.zip!/</resource>
    2.16 +        <resource>jar:nbinst://org.netbeans.modules.testng/modules/ext/testng/TestNG-5.11.zip!/</resource>
    2.17      </volume>
    2.18      <volume>
    2.19          <type>maven-pom</type>