diff options
| author | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-08-13 09:32:12 +0000 |
|---|---|---|
| committer | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-08-13 09:32:12 +0000 |
| commit | b16d733781a2f7d2a56f562be7f06090f724a02a (patch) | |
| tree | 56d2c0dcab51d9e587a3ce9d525dc12244024ba3 /bkucommon | |
| parent | 9ded73fe9608105cca51239793a2f5039894e5c7 (diff) | |
| download | mocca-b16d733781a2f7d2a56f562be7f06090f724a02a.tar.gz mocca-b16d733781a2f7d2a56f562be7f06090f724a02a.tar.bz2 mocca-b16d733781a2f7d2a56f562be7f06090f724a02a.zip | |
minor changes (log)
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@428 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'bkucommon')
| -rw-r--r-- | bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java | 8 | ||||
| -rw-r--r-- | bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java index 832b1770..cb11a3e6 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java @@ -347,8 +347,8 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements srcContex.setSourceUrl(conn.getUrl()); currentState = State.PROCESS; } else if (((contentType.startsWith(HttpUtil.TXT_HTML)) - || (contentType.startsWith(HttpUtil.TXT_PLAIN)) || (contentType - .startsWith(HttpUtil.TXT_XML))) + || (contentType.startsWith(HttpUtil.TXT_PLAIN)) + || (contentType.startsWith(HttpUtil.TXT_XML))) && (dataUrlResponse.isHttpResponseXMLOK())) { log.info("Dataurl response matches <ok/> with content type: " + contentType); @@ -568,10 +568,10 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements commandCtx.setSTAL(getSTAL()); commandCtx.setURLDereferencerContext(new SimpleFormDataContextImpl(this)); commandCtx.setLocale(locale); - slCommand = SLCommandFactory.getInstance().createSLCommand(source, + slCommand = SLCommandFactory.getInstance().createSLCommand(source, commandCtx); log.debug("Created new command: " + slCommand); - } + } @Override public void run() { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java index d9a118e5..41c2512f 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java @@ -84,6 +84,7 @@ public abstract class Configurator { throw new SLRuntimeException(
"Expecting directory as SSL.caDirectory parameter");
}
+ log.info("loading trustStore from " + caDir.getAbsolutePath());
CertificateFactory cf = CertificateFactory.getInstance("X.509");
for (File f : caDir.listFiles()) {
try {
@@ -114,6 +115,7 @@ public abstract class Configurator { throw new SLRuntimeException(
"Expecting directory as SSL.certDirectory parameter");
}
+ log.info("loading certStore from " + certDir.getAbsolutePath());
List<X509Certificate> certCollection = new LinkedList<X509Certificate>();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
for (File f : certDir.listFiles()) {
@@ -256,7 +258,7 @@ public abstract class Configurator { log.debug("Setting user agent to: "
+ properties.getProperty(USERAGENT_CONFIG_P));
} else {
- log.warn("Cannot read manifest");
+ log.warn("Failed to read manifest, setting user-agent to " + USERAGENT_DEFAULT);
properties.setProperty(USERAGENT_CONFIG_P, USERAGENT_DEFAULT);
}
} catch (IOException e) {
|