Merged in ssteinmetz/openesb-components (pull request #12)

Problems in BCs when project uses reference resources (meta-inf)
master
David Brassely 2013-10-18 10:36:38 +02:00
commit f12ae7493e
18 changed files with 26 additions and 26 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.
*
* @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"));
}
}
}

View File

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

View File

@ -373,7 +373,7 @@ public abstract class DeployPluginWizardModel extends ProjectWizardModel {
protected FileObject createJbiXml(FileObject prjDirFO, String jbiXmlTemplatePath, Map tokenMap ) throws IOException {
FileObject confRoot = FileUtil.createFolder(prjDirFO, JbiCompProjectProperties.CONF_DIR_VALUE);
// create meta-inf dir
// create META-INF dir
FileObject metaInfFolder = FileUtil.createFolder(confRoot, "META-INF");
FileObject jbiXmlFO = createFromTemplateFileObject(metaInfFolder, jbiXmlTemplatePath, null, tokenMap);

View File

@ -480,7 +480,7 @@ public abstract class JbiComponentProjectWizardModel extends ProjectWizardModel
protected FileObject createJbiXml(FileObject prjDirFO, String jbiXmlTemplatePath, Map tokenMap ) throws IOException {
FileObject confRoot = FileUtil.createFolder(prjDirFO, JbiCompProjectProperties.CONF_DIR_VALUE);
// create meta-inf dir
// create META-INF dir
FileObject metaInfFolder = FileUtil.createFolder(confRoot, "META-INF");
FileObject jbiXmlFO = createFromTemplateFileObject(metaInfFolder, jbiXmlTemplatePath, null, tokenMap);

View File

@ -55,7 +55,7 @@ public class FileBCSUAssembler implements SUAssembler {
File metaDir = new File(meta);
metaDir.mkdir();
//Copy all WSDL files to meta-inf folder
//Copy all WSDL files to META-INF folder
for (Iterator<String> iter = wsdls.iterator(); iter.hasNext();) {
TestHelper.copyFile(meta, iter.next());
}

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -52,7 +52,7 @@ public class FileBCSUAssembler implements SUAssembler {
File metaDir = new File(meta);
metaDir.mkdir();
//Copy all WSDL files to meta-inf folder
//Copy all WSDL files to META-INF folder
for (Iterator<String> iter = wsdls.iterator(); iter.hasNext();) {
TestHelper.copyFile(meta, iter.next());
}

View File

@ -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;

View File

@ -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;

View File

@ -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();

View File

@ -53,7 +53,7 @@ public class HTTPBCSUAssembler implements SUAssembler {
File metaDir = new File(meta);
metaDir.mkdir();
//Copy all WSDL files to meta-inf folder
//Copy all WSDL files to META-INF folder
for (Iterator<String> iter = wsdls.iterator(); iter.hasNext();) {
String file = iter.next();

View File

@ -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<String, String[]>(envVariableMap);
File catalog = new File(mRootPath.getAbsolutePath() +
File.separator + "meta-inf" + File.separator +
File.separator + "META-INF" + File.separator +
"catalog.xml");
EntityResolver resolver = null;

View File

@ -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;

View File

@ -57,7 +57,7 @@ public class JMSBCSUAssembler implements SUAssembler {
File metaDir = new File(meta);
metaDir.mkdir();
//Copy all WSDL files to meta-inf folder
//Copy all WSDL files to META-INF folder
for (Iterator<String> iter = wsdls.iterator(); iter.hasNext();) {
TestHelper.copyFile(meta, iter.next());
}

View File

@ -220,7 +220,7 @@ public class LdapHelper {
Map<String, String[]> envVariables =
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;