From 0525652920cdce13287cd5af3055081bd1f24ee5 Mon Sep 17 00:00:00 2001 From: brasseld Date: Thu, 8 Oct 2015 10:54:37 +0200 Subject: [PATCH] ESBCOMP-142 Application configuration was not properly found from endpoint --- .../email/protocol/EmailWSDLConfigurations.java | 11 +++-------- .../src/sun-http-binding-config.properties | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) 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 index 9dbfa28f5..f96588098 100644 --- 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 @@ -107,15 +107,10 @@ public class EmailWSDLConfigurations { private static final Logger mLogger = Logger.getLogger(EmailWSDLConfigurations.class.getName()); public EmailWSDLConfigurations(ManagerContext ctx, EndpointInfo info, String suRootPath) throws WSDLException, DeploymentException { - this(suRootPath, ctx); this.mEptInfo = info; - - } - - public EmailWSDLConfigurations(String svcUnitRootPath, ManagerContext ctx) throws WSDLException, DeploymentException { - mMgrCtx = ctx; - appConfig = getAppConfig(svcUnitRootPath); - File dir = new File(svcUnitRootPath); + this.mMgrCtx = ctx; + this.appConfig = getAppConfig(suRootPath); + File dir = new File(suRootPath); this.parse(dir); } diff --git a/ojc-core/httpsoapbc/packaging-full/src/sun-http-binding-config.properties b/ojc-core/httpsoapbc/packaging-full/src/sun-http-binding-config.properties index edaf1e917..cf508c2ed 100755 --- a/ojc-core/httpsoapbc/packaging-full/src/sun-http-binding-config.properties +++ b/ojc-core/httpsoapbc/packaging-full/src/sun-http-binding-config.properties @@ -1,5 +1,5 @@ #Default I18n properties bundle -#Thu Sep 10 16:47:08 PDT 2009 +#Thu Oct 08 10:46:29 CEST 2015 /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='InboundThreads']/@displayName=Number of Inbound Threads /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='AMClasspath']/@displayName=Sun Access Manager Classpath /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='ProxyUserName']/@displayName=Proxy User Name @@ -8,7 +8,7 @@ /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='ClientAuthEnabled']/@displayDescription=Specifies whether or not to enable client authentication (2-way SSL) on the default HTTPS port /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:ApplicationConfiguration/cfg\:Property[@name\='httpUrlLocation']/@displayDescription=Endpoint address - HTTP URL location /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='ProxyPort']/@displayName=Proxy Port -/jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='HttpDefaultPort']/@displayDescription=Default HTTP port number for incoming HTTP/SOAP requests. The default value is -1 which indicates there is no valid port number defined. A valid port number is any positive integer between 1 and 65535, but it is highly recommended to avoid system reserved ports. +/jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='HttpDefaultPort']/@displayDescription=Default HTTP port number for incoming HTTP/SOAP requests. A valid port number is any positive integer between 1 and 65535, but it is highly recommended to avoid system reserved ports. /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='UseJVMProxySettings']/@displayDescription=Determines whether or not to use the default JVM system properties for proxy settings /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:ApplicationConfiguration/cfg\:Property[@name\='configurationName']/@displayName=Application Configuration Name /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='ProxyPassword']/@displayName=Proxy User Password @@ -33,7 +33,7 @@ /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='ProxyType']/@displayDescription=A valid proxy type. Allowed proxy type values are\: SOCKS, HTTP, and DIRECT. This configuration is used for outgoing HTTP/SOAP client invocations only. /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='ProxyPort']/@displayDescription=A valid proxy port. This configuration is used for outgoing HTTP/SOAP client invocations only. /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='AMClasspath']/@displayDescription=Sun Access Manager client sdk jars( comma separated) to be used in the classpath -/jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='HttpsDefaultPort']/@displayDescription=Default HTTPS port number for incoming HTTP/SOAP requests. The default value is -1 which indicates there is no valid port number defined. A valid port number is any positive integer between 1 and 65535, but it is highly recommended to avoid system reserved ports. +/jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='HttpsDefaultPort']/@displayDescription=Default HTTPS port number for incoming HTTP/SOAP requests. A valid port number is any positive integer between 1 and 65535, but it is highly recommended to avoid system reserved ports. /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='OutboundThreads']/@displayName=Number of Outbound Threads /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='InboundReplyThreads']/@displayName=Number of InboundReply Threads /jbi\:jbi/jbi\:component/cfg\:Configuration/cfg\:Property[@name\='ProxyPassword']/@displayDescription=A valid proxy user password