removed dependency selenium client modules on selenium server
authorMartin Fousek <marfous@netbeans.org>
Mon, 09 Jan 2012 11:03:29 +0100
changeset 177353f4a05064da2
parent 17734 3dede6db641b
child 17736 54e97a5b376a
removed dependency selenium client modules on selenium server
selenium.maven/nbproject/project.xml
selenium.php/nbproject/project.xml
selenium/nbproject/project.xml
selenium/src/org/netbeans/modules/selenium/templates/SeleneseTestWizardOperator.java
     1.1 --- a/selenium.maven/nbproject/project.xml	Mon Jan 09 10:55:30 2012 +0100
     1.2 +++ b/selenium.maven/nbproject/project.xml	Mon Jan 09 11:03:29 2012 +0100
     1.3 @@ -60,14 +60,6 @@
     1.4                      </run-dependency>
     1.5                  </dependency>
     1.6                  <dependency>
     1.7 -                    <code-name-base>org.netbeans.modules.selenium.server</code-name-base>
     1.8 -                    <build-prerequisite/>
     1.9 -                    <compile-dependency/>
    1.10 -                    <run-dependency>
    1.11 -                        <specification-version>1.2</specification-version>
    1.12 -                    </run-dependency>
    1.13 -                </dependency>
    1.14 -                <dependency>
    1.15                      <code-name-base>org.netbeans.modules.xml.xam</code-name-base>
    1.16                      <build-prerequisite/>
    1.17                      <compile-dependency/>
     2.1 --- a/selenium.php/nbproject/project.xml	Mon Jan 09 10:55:30 2012 +0100
     2.2 +++ b/selenium.php/nbproject/project.xml	Mon Jan 09 11:03:29 2012 +0100
     2.3 @@ -38,14 +38,6 @@
     2.4                      </run-dependency>
     2.5                  </dependency>
     2.6                  <dependency>
     2.7 -                    <code-name-base>org.netbeans.modules.selenium.server</code-name-base>
     2.8 -                    <build-prerequisite/>
     2.9 -                    <compile-dependency/>
    2.10 -                    <run-dependency>
    2.11 -                        <specification-version>1.2</specification-version>
    2.12 -                    </run-dependency>
    2.13 -                </dependency>
    2.14 -                <dependency>
    2.15                      <code-name-base>org.openide.dialogs</code-name-base>
    2.16                      <build-prerequisite/>
    2.17                      <compile-dependency/>
     3.1 --- a/selenium/nbproject/project.xml	Mon Jan 09 10:55:30 2012 +0100
     3.2 +++ b/selenium/nbproject/project.xml	Mon Jan 09 11:03:29 2012 +0100
     3.3 @@ -78,14 +78,6 @@
     3.4                      </run-dependency>
     3.5                  </dependency>
     3.6                  <dependency>
     3.7 -                    <code-name-base>org.netbeans.modules.selenium.server</code-name-base>
     3.8 -                    <build-prerequisite/>
     3.9 -                    <compile-dependency/>
    3.10 -                    <run-dependency>
    3.11 -                        <specification-version>1.2</specification-version>
    3.12 -                    </run-dependency>
    3.13 -                </dependency>
    3.14 -                <dependency>
    3.15                      <code-name-base>org.netbeans.modules.server</code-name-base>
    3.16                      <build-prerequisite/>
    3.17                      <compile-dependency/>
     4.1 --- a/selenium/src/org/netbeans/modules/selenium/templates/SeleneseTestWizardOperator.java	Mon Jan 09 10:55:30 2012 +0100
     4.2 +++ b/selenium/src/org/netbeans/modules/selenium/templates/SeleneseTestWizardOperator.java	Mon Jan 09 11:03:29 2012 +0100
     4.3 @@ -52,7 +52,6 @@
     4.4  import org.netbeans.api.server.properties.InstanceProperties;
     4.5  import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
     4.6  import org.netbeans.modules.selenium.SeleniumSupport;
     4.7 -import org.netbeans.modules.selenium.server.SeleniumProperties;
     4.8  import org.netbeans.spi.java.project.support.ui.templates.JavaTemplates;
     4.9  import org.netbeans.spi.project.ui.templates.support.Templates;
    4.10  import org.openide.WizardDescriptor;
    4.11 @@ -70,7 +69,8 @@
    4.12  public class SeleneseTestWizardOperator implements WizardDescriptor.AsynchronousInstantiatingIterator {
    4.13  
    4.14      private ChangeSupport changeSupport = new ChangeSupport(this);
    4.15 -    private static final String DEFAULT_SERVER_PORT = "80";         // NOI18N
    4.16 +    private static final String DEFAULT_SERVER_PORT = "80"; //NOI18N
    4.17 +    private static final String DEFAULT_SELENIUM_SERVER_PORT = "4444"; //NOI18N
    4.18      private transient WizardDescriptor.Panel panel;
    4.19      private transient WizardDescriptor wiz;
    4.20  
    4.21 @@ -94,9 +94,9 @@
    4.22          Map<String, Object> params = new HashMap<String, Object>();
    4.23          params.put("server_port", serverPort);   //NOI18N
    4.24  
    4.25 -        InstanceProperties ip = SeleniumProperties.getInstanceProperties();
    4.26 -        int port = ip.getInt(SeleniumProperties.PORT, SeleniumProperties.getSeleniumDefaultPort());
    4.27 -        params.put("selenium_server_port", Integer.toString(port));
    4.28 +//        InstanceProperties ip = SeleniumProperties.getInstanceProperties();
    4.29 +//        int port = ip.getInt(SeleniumProperties.PORT, SeleniumProperties.getSeleniumDefaultPort());
    4.30 +        params.put("selenium_server_port", DEFAULT_SELENIUM_SERVER_PORT);
    4.31  
    4.32          DataObject dobj = dTemplate.createFromTemplate(df, targetName, params);
    4.33          createdFile = dobj.getPrimaryFile();