From 2b5fcaa7357fb02dc898430bf1dec93b5c55e655 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 11 Sep 2013 16:18:24 +0200 Subject: [PATCH] ESBCOMP-49 Problems in BCs when project uses reference resources --- .../java/it/imolinfo/jbi4cics/jbi/Jbi4cicsWSDLDeployer.java | 4 ++-- .../jbi4corba/jbi/component/Jbi4CorbaSUManager.java | 2 +- .../glassfish/openesb/databasebc/JDBCBindingDeployer.java | 2 +- .../jbi/binding/email/protocol/EmailWSDLConfigurations.java | 2 +- .../com/sun/jbi/execbc/packaging/WSDLConfigurations.java | 4 ++-- .../com/sun/jbi/filebc/packaging/WSDLConfigurations.java | 4 ++-- .../src/com/sun/jbi/ftpbc/packaging/WSDLConfigurations.java | 4 ++-- .../src/com/sun/jbi/hl7bc/packaging/WSDLConfigurations.java | 6 +++--- .../jbi/httpsoapbc/jaxwssupport/JAXWSEndpointFactory.java | 2 +- .../src/com/sun/jbi/imsbc/packaging/WSDLConfigurations.java | 4 ++-- .../src/com/sun/jbi/jmsbc/packaging/WSDLConfigurations.java | 4 ++-- .../ldapbcimpl/src/com/sun/jbi/ldapbc/util/LdapHelper.java | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) mode change 100755 => 100644 contrib-imola/cics-bc/jbi4cics/src/main/java/it/imolinfo/jbi4cics/jbi/Jbi4cicsWSDLDeployer.java mode change 100755 => 100644 contrib-imola/corba-bc/jbi4corba/src/main/java/it/imolinfo/jbi4corba/jbi/component/Jbi4CorbaSUManager.java mode change 100755 => 100644 ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/JDBCBindingDeployer.java mode change 100755 => 100644 ojc-core/emailbc/jbiadapter/src/com/sun/jbi/binding/email/protocol/EmailWSDLConfigurations.java mode change 100755 => 100644 ojc-core/execbc/execbcimpl/src/com/sun/jbi/execbc/packaging/WSDLConfigurations.java mode change 100755 => 100644 ojc-core/filebc/filebcimpl/src/com/sun/jbi/filebc/packaging/WSDLConfigurations.java mode change 100755 => 100644 ojc-core/ftpbc/ftpbcimpl/src/com/sun/jbi/ftpbc/packaging/WSDLConfigurations.java mode change 100755 => 100644 ojc-core/hl7bc/hl7bcimpl/src/com/sun/jbi/hl7bc/packaging/WSDLConfigurations.java mode change 100755 => 100644 ojc-core/httpsoapbc/httpsoapbcimpl/src/com/sun/jbi/httpsoapbc/jaxwssupport/JAXWSEndpointFactory.java mode change 100755 => 100644 ojc-core/imsbc/imsbcimpl/src/com/sun/jbi/imsbc/packaging/WSDLConfigurations.java mode change 100755 => 100644 ojc-core/jmsbc/jmsbcimpl/src/com/sun/jbi/jmsbc/packaging/WSDLConfigurations.java mode change 100755 => 100644 ojc-core/ldapbc/ldapbcimpl/src/com/sun/jbi/ldapbc/util/LdapHelper.java diff --git a/contrib-imola/cics-bc/jbi4cics/src/main/java/it/imolinfo/jbi4cics/jbi/Jbi4cicsWSDLDeployer.java b/contrib-imola/cics-bc/jbi4cics/src/main/java/it/imolinfo/jbi4cics/jbi/Jbi4cicsWSDLDeployer.java old mode 100755 new mode 100644 index 2bf00753c..54ab8005f --- a/contrib-imola/cics-bc/jbi4cics/src/main/java/it/imolinfo/jbi4cics/jbi/Jbi4cicsWSDLDeployer.java +++ b/contrib-imola/cics-bc/jbi4cics/src/main/java/it/imolinfo/jbi4cics/jbi/Jbi4cicsWSDLDeployer.java @@ -553,7 +553,7 @@ public final class Jbi4cicsWSDLDeployer extends AbstractDeployer { } /** - * Accepts only directories not called META-INF, meta-inf + * Accepts only directories not called META-INF, META-INF * and so on considering case. * * @param file the file to test. @@ -563,7 +563,7 @@ public final class Jbi4cicsWSDLDeployer extends AbstractDeployer { */ public boolean accept(final File file) { return file.isDirectory() - && !(file.getName().equalsIgnoreCase("meta-inf")); + && !(file.getName().equalsIgnoreCase("META-INF")); } } } diff --git a/contrib-imola/corba-bc/jbi4corba/src/main/java/it/imolinfo/jbi4corba/jbi/component/Jbi4CorbaSUManager.java b/contrib-imola/corba-bc/jbi4corba/src/main/java/it/imolinfo/jbi4corba/jbi/component/Jbi4CorbaSUManager.java old mode 100755 new mode 100644 index 841776f84..906aff600 --- a/contrib-imola/corba-bc/jbi4corba/src/main/java/it/imolinfo/jbi4corba/jbi/component/Jbi4CorbaSUManager.java +++ b/contrib-imola/corba-bc/jbi4corba/src/main/java/it/imolinfo/jbi4corba/jbi/component/Jbi4CorbaSUManager.java @@ -594,7 +594,7 @@ public class Jbi4CorbaSUManager extends DefaultServiceUnitManager { new HashMap(envVariableMap); File catalog = new File(suPath + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; diff --git a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/JDBCBindingDeployer.java b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/JDBCBindingDeployer.java old mode 100755 new mode 100644 index df8af617f..6867ad7eb --- a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/JDBCBindingDeployer.java +++ b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/JDBCBindingDeployer.java @@ -1429,7 +1429,7 @@ public class JDBCBindingDeployer implements ServiceUnitManager { private List readAllXSDs(final File asaDir, final String id, final String taskName, final String locToken) throws DeploymentException { 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"); catalogManager.setRelativeCatalogs(true); diff --git a/ojc-core/emailbc/jbiadapter/src/com/sun/jbi/binding/email/protocol/EmailWSDLConfigurations.java b/ojc-core/emailbc/jbiadapter/src/com/sun/jbi/binding/email/protocol/EmailWSDLConfigurations.java old mode 100755 new mode 100644 index b5912e724..9dbfa28f5 --- a/ojc-core/emailbc/jbiadapter/src/com/sun/jbi/binding/email/protocol/EmailWSDLConfigurations.java +++ b/ojc-core/emailbc/jbiadapter/src/com/sun/jbi/binding/email/protocol/EmailWSDLConfigurations.java @@ -132,7 +132,7 @@ public class EmailWSDLConfigurations { private void parse(File dir) throws WSDLException { 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); EntityResolver resolver = new CatalogResolver(catalogManager); diff --git a/ojc-core/execbc/execbcimpl/src/com/sun/jbi/execbc/packaging/WSDLConfigurations.java b/ojc-core/execbc/execbcimpl/src/com/sun/jbi/execbc/packaging/WSDLConfigurations.java old mode 100755 new mode 100644 index 594c9049d..4c5f63544 --- a/ojc-core/execbc/execbcimpl/src/com/sun/jbi/execbc/packaging/WSDLConfigurations.java +++ b/ojc-core/execbc/execbcimpl/src/com/sun/jbi/execbc/packaging/WSDLConfigurations.java @@ -112,7 +112,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; @@ -140,7 +140,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; diff --git a/ojc-core/filebc/filebcimpl/src/com/sun/jbi/filebc/packaging/WSDLConfigurations.java b/ojc-core/filebc/filebcimpl/src/com/sun/jbi/filebc/packaging/WSDLConfigurations.java old mode 100755 new mode 100644 index b15d5d900..38659d334 --- a/ojc-core/filebc/filebcimpl/src/com/sun/jbi/filebc/packaging/WSDLConfigurations.java +++ b/ojc-core/filebc/filebcimpl/src/com/sun/jbi/filebc/packaging/WSDLConfigurations.java @@ -109,7 +109,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; @@ -158,7 +158,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; diff --git a/ojc-core/ftpbc/ftpbcimpl/src/com/sun/jbi/ftpbc/packaging/WSDLConfigurations.java b/ojc-core/ftpbc/ftpbcimpl/src/com/sun/jbi/ftpbc/packaging/WSDLConfigurations.java old mode 100755 new mode 100644 index d616f8262..e3fda85bb --- a/ojc-core/ftpbc/ftpbcimpl/src/com/sun/jbi/ftpbc/packaging/WSDLConfigurations.java +++ b/ojc-core/ftpbc/ftpbcimpl/src/com/sun/jbi/ftpbc/packaging/WSDLConfigurations.java @@ -111,7 +111,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; @@ -163,7 +163,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; diff --git a/ojc-core/hl7bc/hl7bcimpl/src/com/sun/jbi/hl7bc/packaging/WSDLConfigurations.java b/ojc-core/hl7bc/hl7bcimpl/src/com/sun/jbi/hl7bc/packaging/WSDLConfigurations.java old mode 100755 new mode 100644 index 9b6b45408..4097d2b6b --- a/ojc-core/hl7bc/hl7bcimpl/src/com/sun/jbi/hl7bc/packaging/WSDLConfigurations.java +++ b/ojc-core/hl7bc/hl7bcimpl/src/com/sun/jbi/hl7bc/packaging/WSDLConfigurations.java @@ -125,7 +125,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + File.separator - + "meta-inf" + File.separator + "catalog.xml"); + + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; @@ -157,7 +157,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + File.separator - + "meta-inf" + File.separator + "catalog.xml"); + + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; @@ -188,7 +188,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + File.separator - + "meta-inf" + File.separator + "catalog.xml"); + + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; diff --git a/ojc-core/httpsoapbc/httpsoapbcimpl/src/com/sun/jbi/httpsoapbc/jaxwssupport/JAXWSEndpointFactory.java b/ojc-core/httpsoapbc/httpsoapbcimpl/src/com/sun/jbi/httpsoapbc/jaxwssupport/JAXWSEndpointFactory.java old mode 100755 new mode 100644 index 6c1cb415f..416785a14 --- a/ojc-core/httpsoapbc/httpsoapbcimpl/src/com/sun/jbi/httpsoapbc/jaxwssupport/JAXWSEndpointFactory.java +++ b/ojc-core/httpsoapbc/httpsoapbcimpl/src/com/sun/jbi/httpsoapbc/jaxwssupport/JAXWSEndpointFactory.java @@ -154,7 +154,7 @@ public class JAXWSEndpointFactory { // in the JAX-WS layer. URL catalogURL = null; File catalog = new File(endpoint.getServiceUnitRootPath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); if (catalog.exists()) { catalogURL = catalog.toURL(); diff --git a/ojc-core/imsbc/imsbcimpl/src/com/sun/jbi/imsbc/packaging/WSDLConfigurations.java b/ojc-core/imsbc/imsbcimpl/src/com/sun/jbi/imsbc/packaging/WSDLConfigurations.java old mode 100755 new mode 100644 index 59b867f5c..b6557a0e7 --- a/ojc-core/imsbc/imsbcimpl/src/com/sun/jbi/imsbc/packaging/WSDLConfigurations.java +++ b/ojc-core/imsbc/imsbcimpl/src/com/sun/jbi/imsbc/packaging/WSDLConfigurations.java @@ -123,7 +123,7 @@ public class WSDLConfigurations { throws Exception { File catalog = new File(mRootPath.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; @@ -154,7 +154,7 @@ public class WSDLConfigurations { new HashMap(envVariableMap); File catalog = new File(mRootPath.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; diff --git a/ojc-core/jmsbc/jmsbcimpl/src/com/sun/jbi/jmsbc/packaging/WSDLConfigurations.java b/ojc-core/jmsbc/jmsbcimpl/src/com/sun/jbi/jmsbc/packaging/WSDLConfigurations.java old mode 100755 new mode 100644 index c934b3c2d..2b9209364 --- a/ojc-core/jmsbc/jmsbcimpl/src/com/sun/jbi/jmsbc/packaging/WSDLConfigurations.java +++ b/ojc-core/jmsbc/jmsbcimpl/src/com/sun/jbi/jmsbc/packaging/WSDLConfigurations.java @@ -124,7 +124,7 @@ public class WSDLConfigurations { File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; @@ -151,7 +151,7 @@ public class WSDLConfigurations { Map envVariables = (Map)((HashMap)envVariableMap).clone(); File dir = new File(mRootPath); File catalog = new File(dir.getAbsolutePath() + - File.separator + "meta-inf" + File.separator + + File.separator + "META-INF" + File.separator + "catalog.xml"); EntityResolver resolver = null; diff --git a/ojc-core/ldapbc/ldapbcimpl/src/com/sun/jbi/ldapbc/util/LdapHelper.java b/ojc-core/ldapbc/ldapbcimpl/src/com/sun/jbi/ldapbc/util/LdapHelper.java old mode 100755 new mode 100644 index 8046074b6..8529db778 --- a/ojc-core/ldapbc/ldapbcimpl/src/com/sun/jbi/ldapbc/util/LdapHelper.java +++ b/ojc-core/ldapbc/ldapbcimpl/src/com/sun/jbi/ldapbc/util/LdapHelper.java @@ -220,7 +220,7 @@ public class LdapHelper { Map envVariables = new HashMap(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;