ESBCOMP-49

Problems in BCs when project uses reference resources
master
Simon 2013-09-11 16:18:24 +02:00
parent 6c10019b0f
commit 2b5fcaa735
12 changed files with 20 additions and 20 deletions

View File

@ -553,7 +553,7 @@ public final class Jbi4cicsWSDLDeployer extends AbstractDeployer {
} }
/** /**
* Accepts only directories not called <i>META-INF</i>, <i>meta-inf</i> * Accepts only directories not called <i>META-INF</i>, <i>META-INF</i>
* and so on considering case. * and so on considering case.
* *
* @param file the file to test. * @param file the file to test.
@ -563,7 +563,7 @@ public final class Jbi4cicsWSDLDeployer extends AbstractDeployer {
*/ */
public boolean accept(final File file) { public boolean accept(final File file) {
return file.isDirectory() return file.isDirectory()
&& !(file.getName().equalsIgnoreCase("meta-inf")); && !(file.getName().equalsIgnoreCase("META-INF"));
} }
} }
} }

View File

@ -594,7 +594,7 @@ public class Jbi4CorbaSUManager extends DefaultServiceUnitManager {
new HashMap<String, String[]>(envVariableMap); new HashMap<String, String[]>(envVariableMap);
File catalog = new File(suPath + File catalog = new File(suPath +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;

View File

@ -1429,7 +1429,7 @@ public class JDBCBindingDeployer implements ServiceUnitManager {
private List readAllXSDs(final File asaDir, final String id, private List readAllXSDs(final File asaDir, final String id,
final String taskName, final String locToken) throws DeploymentException { final String taskName, final String locToken) throws DeploymentException {
final CatalogManager catalogManager = new CatalogManager(); final CatalogManager catalogManager = new CatalogManager();
catalogManager.setCatalogFiles(asaDir.getAbsolutePath() + File.separator + "meta-inf" + catalogManager.setCatalogFiles(asaDir.getAbsolutePath() + File.separator + "META-INF" +
File.separator + "catalog.xml"); File.separator + "catalog.xml");
catalogManager.setRelativeCatalogs(true); catalogManager.setRelativeCatalogs(true);

View File

@ -132,7 +132,7 @@ public class EmailWSDLConfigurations {
private void parse(File dir) throws WSDLException { private void parse(File dir) throws WSDLException {
CatalogManager catalogManager = new CatalogManager(); CatalogManager catalogManager = new CatalogManager();
catalogManager.setCatalogFiles(dir.getAbsolutePath() + File.separator + "meta-inf" + File.separator + "catalog.xml"); catalogManager.setCatalogFiles(dir.getAbsolutePath() + File.separator + "META-INF" + File.separator + "catalog.xml");
catalogManager.setRelativeCatalogs(true); catalogManager.setRelativeCatalogs(true);
EntityResolver resolver = new CatalogResolver(catalogManager); EntityResolver resolver = new CatalogResolver(catalogManager);

View File

@ -112,7 +112,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;
@ -140,7 +140,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;

View File

@ -109,7 +109,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;
@ -158,7 +158,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;

View File

@ -111,7 +111,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;
@ -163,7 +163,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;

View File

@ -125,7 +125,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File.separator File catalog = new File(dir.getAbsolutePath() + File.separator
+ "meta-inf" + File.separator + "catalog.xml"); + "META-INF" + File.separator + "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;
@ -157,7 +157,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File.separator File catalog = new File(dir.getAbsolutePath() + File.separator
+ "meta-inf" + File.separator + "catalog.xml"); + "META-INF" + File.separator + "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;
@ -188,7 +188,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File.separator File catalog = new File(dir.getAbsolutePath() + File.separator
+ "meta-inf" + File.separator + "catalog.xml"); + "META-INF" + File.separator + "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;

View File

@ -154,7 +154,7 @@ public class JAXWSEndpointFactory {
// in the JAX-WS layer. // in the JAX-WS layer.
URL catalogURL = null; URL catalogURL = null;
File catalog = new File(endpoint.getServiceUnitRootPath() + File catalog = new File(endpoint.getServiceUnitRootPath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
if (catalog.exists()) { if (catalog.exists()) {
catalogURL = catalog.toURL(); catalogURL = catalog.toURL();

View File

@ -123,7 +123,7 @@ public class WSDLConfigurations {
throws Exception { throws Exception {
File catalog = new File(mRootPath.getAbsolutePath() + File catalog = new File(mRootPath.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;
@ -154,7 +154,7 @@ public class WSDLConfigurations {
new HashMap<String, String[]>(envVariableMap); new HashMap<String, String[]>(envVariableMap);
File catalog = new File(mRootPath.getAbsolutePath() + File catalog = new File(mRootPath.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;

View File

@ -124,7 +124,7 @@ public class WSDLConfigurations {
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;
@ -151,7 +151,7 @@ public class WSDLConfigurations {
Map envVariables = (Map)((HashMap)envVariableMap).clone(); Map envVariables = (Map)((HashMap)envVariableMap).clone();
File dir = new File(mRootPath); File dir = new File(mRootPath);
File catalog = new File(dir.getAbsolutePath() + File catalog = new File(dir.getAbsolutePath() +
File.separator + "meta-inf" + File.separator + File.separator + "META-INF" + File.separator +
"catalog.xml"); "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;

View File

@ -220,7 +220,7 @@ public class LdapHelper {
Map<String, String[]> envVariables = Map<String, String[]> envVariables =
new HashMap<String, String[]>(envVariableMap); new HashMap<String, String[]>(envVariableMap);
File catalog = new File(suDir.getAbsolutePath() + File.separator + "meta-inf" + File.separator + "catalog.xml"); File catalog = new File(suDir.getAbsolutePath() + File.separator + "META-INF" + File.separator + "catalog.xml");
EntityResolver resolver = null; EntityResolver resolver = null;