From b8ae8213457a577531ca0d2e46180bdcdb261379 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 11 Sep 2013 16:23:36 +0200 Subject: [PATCH] ESBCOMP-49 Problems in BCs when project uses reference resources --- .../jbi/apisupport/project/wizard/DeployPluginWizardModel.java | 2 +- .../project/wizard/JbiComponentProjectWizardModel.java | 2 +- .../jbi/integration/test/framework/impl/FileBCSUAssembler.java | 2 +- .../jbi/integration/test/framework/impl/FileBCSUAssembler.java | 2 +- .../jbi/integration/test/framework/impl/HTTPBCSUAssembler.java | 2 +- .../jbi/integration/test/framework/impl/JMSBCSUAssembler.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/DeployPluginWizardModel.java mode change 100755 => 100644 jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/JbiComponentProjectWizardModel.java mode change 100755 => 100644 ojc-core/filebc/filebcimpl/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java mode change 100755 => 100644 ojc-core/httpsoapbc/httpsoapbcimpl/test/test/jbi/integration/test/framework/impl/HTTPBCSUAssembler.java mode change 100755 => 100644 ojc-core/jmsbc/jmsbcimpl/test/test/jbi/integration/test/framework/impl/JMSBCSUAssembler.java diff --git a/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/DeployPluginWizardModel.java b/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/DeployPluginWizardModel.java old mode 100755 new mode 100644 index ad1455146..fdcd3cbec --- a/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/DeployPluginWizardModel.java +++ b/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/DeployPluginWizardModel.java @@ -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); diff --git a/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/JbiComponentProjectWizardModel.java b/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/JbiComponentProjectWizardModel.java old mode 100755 new mode 100644 index 7bd99cdb5..c7f4eba94 --- a/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/JbiComponentProjectWizardModel.java +++ b/jbi-cdk/jbisupport/jbicomponentsupport/src/org/netbeans/modules/jbi/apisupport/project/wizard/JbiComponentProjectWizardModel.java @@ -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); diff --git a/maven-ojc-archeType-v2/maven-archetype-binding-component-v2/src/main/resources/archetype-resources/jbiadapter/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java b/maven-ojc-archeType-v2/maven-archetype-binding-component-v2/src/main/resources/archetype-resources/jbiadapter/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java index c36ceb86b..05feed7bc 100644 --- a/maven-ojc-archeType-v2/maven-archetype-binding-component-v2/src/main/resources/archetype-resources/jbiadapter/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java +++ b/maven-ojc-archeType-v2/maven-archetype-binding-component-v2/src/main/resources/archetype-resources/jbiadapter/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java @@ -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 iter = wsdls.iterator(); iter.hasNext();) { TestHelper.copyFile(meta, iter.next()); } diff --git a/ojc-core/filebc/filebcimpl/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java b/ojc-core/filebc/filebcimpl/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java old mode 100755 new mode 100644 index 3598118e5..da921e1c1 --- a/ojc-core/filebc/filebcimpl/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java +++ b/ojc-core/filebc/filebcimpl/test/test/jbi/integration/test/framework/impl/FileBCSUAssembler.java @@ -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 iter = wsdls.iterator(); iter.hasNext();) { TestHelper.copyFile(meta, iter.next()); } diff --git a/ojc-core/httpsoapbc/httpsoapbcimpl/test/test/jbi/integration/test/framework/impl/HTTPBCSUAssembler.java b/ojc-core/httpsoapbc/httpsoapbcimpl/test/test/jbi/integration/test/framework/impl/HTTPBCSUAssembler.java old mode 100755 new mode 100644 index 281f16f3f..c0e7e8db2 --- a/ojc-core/httpsoapbc/httpsoapbcimpl/test/test/jbi/integration/test/framework/impl/HTTPBCSUAssembler.java +++ b/ojc-core/httpsoapbc/httpsoapbcimpl/test/test/jbi/integration/test/framework/impl/HTTPBCSUAssembler.java @@ -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 iter = wsdls.iterator(); iter.hasNext();) { String file = iter.next(); diff --git a/ojc-core/jmsbc/jmsbcimpl/test/test/jbi/integration/test/framework/impl/JMSBCSUAssembler.java b/ojc-core/jmsbc/jmsbcimpl/test/test/jbi/integration/test/framework/impl/JMSBCSUAssembler.java old mode 100755 new mode 100644 index b7ae9f062..76e0e9571 --- a/ojc-core/jmsbc/jmsbcimpl/test/test/jbi/integration/test/framework/impl/JMSBCSUAssembler.java +++ b/ojc-core/jmsbc/jmsbcimpl/test/test/jbi/integration/test/framework/impl/JMSBCSUAssembler.java @@ -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 iter = wsdls.iterator(); iter.hasNext();) { TestHelper.copyFile(meta, iter.next()); }