Wait for 03/30/2007 build for org.netbeans.modules.j2eeserver 1.23.0. merged_model_merge_trunk_1
authorpotingwu@netbeans.org
Fri, 30 Mar 2007 03:20:20 +0000
changeset 40933154e57f0a3
parent 408 bc9308f2fe70
child 410 bc615ebfe02b
Wait for 03/30/2007 build for org.netbeans.modules.j2eeserver 1.23.0.
visualweb.project.jsf/nbproject/project.xml
visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DesignTimeDataSourceServiceImpl.java
     1.1 --- a/visualweb.project.jsf/nbproject/project.xml	Thu Mar 29 23:04:32 2007 +0000
     1.2 +++ b/visualweb.project.jsf/nbproject/project.xml	Fri Mar 30 03:20:20 2007 +0000
     1.3 @@ -48,7 +48,7 @@
     1.4                      <compile-dependency/>
     1.5                      <run-dependency>
     1.6                          <release-version>4</release-version>
     1.7 -                        <specification-version>1.23.0</specification-version>
     1.8 +                        <specification-version>1.12.1</specification-version>
     1.9                      </run-dependency>
    1.10                  </dependency>
    1.11                  <dependency>
     2.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DesignTimeDataSourceServiceImpl.java	Thu Mar 29 23:04:32 2007 +0000
     2.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/services/DesignTimeDataSourceServiceImpl.java	Fri Mar 30 03:20:20 2007 +0000
     2.3 @@ -28,7 +28,8 @@
     2.4  
     2.5  package org.netbeans.modules.visualweb.project.jsf.services;
     2.6  
     2.7 -import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
     2.8 +// XXX wait for 03/30/2007 build for org.netbeans.modules.j2eeserver 1.23.0
     2.9 +// import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
    2.10  import org.netbeans.modules.visualweb.api.j2ee.common.RequestedJdbcResource;
    2.11  import java.util.HashSet;
    2.12  
    2.13 @@ -59,7 +60,8 @@
    2.14          Set  dss = null;
    2.15          try {
    2.16              dss = jmp.getModuleDatasources();
    2.17 -        } catch (ConfigurationException e) {
    2.18 +        // XXX wait for 03/30/2007 build for org.netbeans.modules.j2eeserver 1.23.0
    2.19 +        } catch (Exception /*ConfigurationException*/ e) {
    2.20              dss = new HashSet();
    2.21              // TODO: give some feedback to the user
    2.22          }
    2.23 @@ -82,7 +84,8 @@
    2.24              try {
    2.25                  jmp.createDatasource(req.getResourceName(), req.getUrl(),
    2.26                          req.getUsername(), req.getPassword(), req.getDriverClassName());
    2.27 -            } catch (ConfigurationException e) {
    2.28 +            // XXX wait for 03/30/2007 build for org.netbeans.modules.j2eeserver 1.23.0
    2.29 +            // } catch (ConfigurationException e) {
    2.30                  // TODO: give some feedback to the user
    2.31              } catch (DatasourceAlreadyExistsException e) {
    2.32                  List dsList = e.getDatasources();
    2.33 @@ -126,7 +129,8 @@
    2.34          Set<Datasource> dss = null;
    2.35          try {
    2.36              dss = jmp.getServerDatasources();
    2.37 -        } catch (ConfigurationException e) {
    2.38 +        // XXX wait for 03/30/2007 build for org.netbeans.modules.j2eeserver 1.23.0
    2.39 +        } catch (Exception /*ConfigurationException*/ e) {
    2.40              dss = new HashSet<Datasource>();
    2.41              // TODO: give some feedback to the user
    2.42          }
    2.43 @@ -151,7 +155,8 @@
    2.44          Set<Datasource> dss = null;
    2.45          try {
    2.46              dss = jmp.getModuleDatasources();
    2.47 -        } catch (ConfigurationException e) {
    2.48 +        // XXX wait for 03/30/2007 build for org.netbeans.modules.j2eeserver 1.23.0
    2.49 +        } catch (Exception /*ConfigurationException*/ e) {
    2.50              dss = new HashSet<Datasource>();
    2.51              // TODO: give some feedback to the user
    2.52          }