Skip to content

Commit 8553c5f

Browse files
arcadmlafonarcadmlafon
committed
Restlet 2.6 integration.
1 parent 8af98d7 commit 8553c5f

7 files changed

Lines changed: 233 additions & 137 deletions

File tree

‎bundles/common/rest/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Import-Package: com.arcadsoftware.crypt;version="[1.0.0,2.0.0)",
2626
org.codehaus.jettison.json;version="[1.5.4,2.0.0)",
2727
org.codehaus.jettison.mapped;version="[1.5.4,2.0.0)",
2828
org.eclipse.core.runtime;common=split;version="[3.4.0,4.0.0)",
29-
org.eclipse.jetty.http;version="[12.1.0,13.0.0)",
30-
org.eclipse.jetty.io;version="[12.1.0,13.0.0)",
29+
org.eclipse.jetty.http;version="[12.0.0,12.1.0)",
30+
org.eclipse.jetty.io;version="[12.0.0,12.1.0)",
3131
org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
3232
org.ietf.jgss,
3333
org.osgi.framework;version="[1.5.0,2.0.0)",

‎bundles/repack/org.restlet/.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>restlet-base</name>
3+
<name>org.restlet</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎bundles/server/server.binaries/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Import-Package: com.arcadsoftware.crypt;version="[1.3.0,2.0.0)",
1010
com.arcadsoftware.osgi;version="[1.3.1,3.0.0)",
1111
com.arcadsoftware.rest;version="[3.0.0,4.0.0)",
1212
javax.servlet.http,
13-
org.eclipse.jetty.http;version="[12.1.0,13.0.0)",
13+
org.eclipse.jetty.http;version="[12.0.0,12.1.0)",
1414
org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
1515
org.osgi.framework;version="[1.8.0,2.0.0)",
1616
org.osgi.service.event;version="[1.3.1,2.0.0)",

‎bundles/server/server.properties/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Import-Package: com.arcadsoftware.osgi;version="[1.0.1,3.0.0)",
2121
com.thoughtworks.xstream.mapper;version="[1.4.200,1.5.0)",
2222
javax.servlet;version="[4.0.0,5.0.0)",
2323
org.eclipse.core.runtime;common=split;version="[3.5.0,4.0.0)",
24-
org.eclipse.jetty.http;version="[12.1.0,13.0.0)",
24+
org.eclipse.jetty.http;version="[12.0.0,12.1.0)",
2525
org.eclipse.osgi.framework.console;version="[1.1.0,2.0.0)",
2626
org.eclipse.osgi.util;version="[1.1.0,2.0.0)",
2727
org.osgi.framework;version="[1.8.0,2.0.0)",

‎bundles/server/server.restful/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Import-Package: com.arcadsoftware.crypt;version="[1.0.0,2.0.0)",
4747
org.restlet.data;version="[2.6.0,2.7.0)",
4848
org.restlet.engine;version="[2.6.0,2.7.0)",
4949
org.restlet.engine.connector;version="[2.6.0,2.7.0)",
50+
org.restlet.engine.ssl;version="[2.6.0,3.0.0)",
5051
org.restlet.ext.jetty;version="[2.6.0,2.7.0)",
5152
org.restlet.representation;version="[2.6.0,2.7.0)",
5253
org.restlet.resource;version="[2.6.0,2.7.0)",

‎bundles/server/server.restful/src/com/arcadsoftware/restful/internal/Activator.java‎

Lines changed: 2 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -355,50 +355,7 @@ private synchronized void startServer() {
355355
throw new ServerConfigurationException("The HTTPS Server connector is not available. Please check the server configuration, some bundles may be absent or not started, correct the error and refresh this bundle.");
356356
}
357357
component.getServers().add(server);
358-
Series<Parameter> parameters = server.getContext().getParameters();
359-
parameters.add("sslContextFactory", "org.restlet.engine.ssl.DefaultSslContextFactory"); //$NON-NLS-1$ //$NON-NLS-2$
360-
parameters.add("keyStorePath", serverProps.getkStore()); //$NON-NLS-1$
361-
parameters.add("keyStorePassword", new String(serverProps.getkSPwd())); //$NON-NLS-1$
362-
parameters.add("keyPassword", new String(serverProps.getKeyPwd())); //$NON-NLS-1$
363-
if ((serverProps.getkSType() != null) && !serverProps.getkSType().isEmpty()) {
364-
parameters.add("keyStoreType", serverProps.getkSType()); //$NON-NLS-1$
365-
}
366-
if ((serverProps.getDisabledCipherSuites() != null) && !serverProps.getDisabledCipherSuites().isEmpty()) {
367-
parameters.add("disabledCipherSuites", serverProps.getDisabledCipherSuites()); //$NON-NLS-1$
368-
}
369-
if ((serverProps.getDisabledProtocols() != null) && serverProps.getDisabledProtocols().isEmpty()) {
370-
parameters.add("disabledProtocols", serverProps.getDisabledProtocols()); //$NON-NLS-1$
371-
}
372-
if ((serverProps.getEnabledCipherSuites() != null) && serverProps.getEnabledCipherSuites().isEmpty()) {
373-
parameters.add("enabledCipherSuites", serverProps.getEnabledCipherSuites()); //$NON-NLS-1$
374-
}
375-
if ((serverProps.getEnabledProtocols() != null) && !serverProps.getEnabledProtocols().isEmpty()) {
376-
parameters.add("enabledProtocols", serverProps.getEnabledProtocols()); //$NON-NLS-1$
377-
}
378-
if ((serverProps.getKeyManagerAlgorithm() != null) && !serverProps.getKeyManagerAlgorithm().isEmpty()) {
379-
parameters.add("keyManagerAlgorithm", serverProps.getKeyManagerAlgorithm()); //$NON-NLS-1$
380-
}
381-
if ((serverProps.getProtocol() != null) && !serverProps.getProtocol().isEmpty()) {
382-
parameters.add("protocol", serverProps.getProtocol()); //$NON-NLS-1$
383-
}
384-
if ((serverProps.getSecureRandomAlgorithm() != null) && serverProps.getSecureRandomAlgorithm().isEmpty()) {
385-
parameters.add("secureRandomAlgorithm", serverProps.getSecureRandomAlgorithm()); //$NON-NLS-1$
386-
}
387-
if (serverProps.isKeyClient() && (serverProps.gettStore() != null) && !serverProps.gettStore().isEmpty()) {
388-
parameters.add("trustStorePath", serverProps.gettStore()); //$NON-NLS-1$
389-
if (serverProps.gettSPwd() != null) {
390-
parameters.add("trustStorePassword", new String(serverProps.gettSPwd())); //$NON-NLS-1$
391-
}
392-
if (serverProps.gettSType() != null) {
393-
parameters.add("trustStoreType", serverProps.gettSType()); //$NON-NLS-1$
394-
}
395-
if (serverProps.getTrustManagerAlgorithm() != null) {
396-
parameters.add("trustManagerAlgorithm", serverProps.getTrustManagerAlgorithm()); //$NON-NLS-1$
397-
}
398-
parameters.add("needClientAuthentication", "true"); //$NON-NLS-1$ //$NON-NLS-2$
399-
//parameters.add("wantClientAuthentication", "true"); //$NON-NLS-1$ //$NON-NLS-2$
400-
}
401-
jettyServerFineTuning(parameters);
358+
serverProps.setHTTPSParameters(server.getContext().getParameters());
402359
} else if (serverProps.getPortssl() > 0) {
403360
error("The HTTPS Server is not correctly configured and can not be started.");
404361
}
@@ -409,7 +366,7 @@ private synchronized void startServer() {
409366
throw new ServerConfigurationException("The HTTP Server connector is not available. Please check the server configuration, some bundles may be absent or not started, correct the error and refresh this bundle.");
410367
}
411368
component.getServers().add(server);
412-
jettyServerFineTuning(server.getContext().getParameters());
369+
serverProps.setHTTPParameters(server.getContext().getParameters());
413370
warn("Using an HTTP Server on production environment is a security breach. Change the Server configuration to use only an HTTPS server.");
414371
}
415372
component.getClients().add(Protocol.HTTP);
@@ -524,92 +481,6 @@ private synchronized void startServer() {
524481
}
525482
}
526483

527-
private void jettyServerFineTuning(Series<Parameter> parameters) {
528-
// Jetty HTTP Server fine tuning:
529-
// parameters specification from https://javadocs.restlet.talend.com/2.4/jse/ext/org/restlet/ext/jetty/JettyServerHelper.html
530-
parameters.add("http.requestHeaderSize", Integer.getInteger("com.arcadsoftware.httprequestheaderlimit", 16384).toString()); //$NON-NLS-1$ //$NON-NLS-2$
531-
parameters.add("http.responseHeaderSize", Integer.getInteger("com.arcadsoftware.httpresponseheaderlimit", 16384).toString()); //$NON-NLS-1$ //$NON-NLS-2$
532-
Integer i = Integer.getInteger("com.arcadsoftware.threadPoolminThreads"); //$NON-NLS-1$
533-
if (i != null) {
534-
parameters.add("threadPool.minThreads", i.toString()); //$NON-NLS-1$
535-
}
536-
i = Integer.getInteger("com.arcadsoftware.threadPool.maxThreads"); //$NON-NLS-1$
537-
if (i != null) {
538-
parameters.add("threadPool.maxThreads", i.toString()); //$NON-NLS-1$
539-
}
540-
i = Integer.getInteger("com.arcadsoftware.threadPool.threadsPriority"); //$NON-NLS-1$
541-
if (i != null) {
542-
parameters.add("threadPool.threadsPriority", i.toString()); //$NON-NLS-1$
543-
}
544-
i = Integer.getInteger("com.arcadsoftware.threadPool.idleTimeout"); //$NON-NLS-1$
545-
if (i != null) {
546-
parameters.add("threadPool.idleTimeout", i.toString()); //$NON-NLS-1$
547-
}
548-
i = Integer.getInteger("com.arcadsoftware.threadPool.stopTimeout"); //$NON-NLS-1$
549-
if (i != null) {
550-
parameters.add("threadPool.stopTimeout", i.toString()); //$NON-NLS-1$
551-
}
552-
i = Integer.getInteger("com.arcadsoftware.connector.acceptors"); //$NON-NLS-1$
553-
if (i != null) {
554-
parameters.add("connector.acceptors", i.toString()); //$NON-NLS-1$
555-
}
556-
i = Integer.getInteger("com.arcadsoftware.connector.selectors"); //$NON-NLS-1$
557-
if (i != null) {
558-
parameters.add("connector.selectors", i.toString()); //$NON-NLS-1$
559-
}
560-
i = Integer.getInteger("com.arcadsoftware.connector.acceptQueueSize"); //$NON-NLS-1$
561-
if (i != null) {
562-
parameters.add("connector.acceptQueueSize", i.toString()); //$NON-NLS-1$
563-
}
564-
i = Integer.getInteger("com.arcadsoftware.connector.idleTimeout"); //$NON-NLS-1$
565-
if (i != null) {
566-
parameters.add("connector.idleTimeout", i.toString()); //$NON-NLS-1$
567-
}
568-
i = Integer.getInteger("com.arcadsoftware.connector.soLingerTime"); //$NON-NLS-1$
569-
if (i != null) {
570-
parameters.add("connector.soLingerTime", i.toString()); //$NON-NLS-1$
571-
}
572-
i = Integer.getInteger("com.arcadsoftware.connector.stopTimeout"); //$NON-NLS-1$
573-
if (i != null) {
574-
parameters.add("connector.stopTimeout", i.toString()); //$NON-NLS-1$
575-
}
576-
i = Integer.getInteger("com.arcadsoftware.http.headerCacheSize"); //$NON-NLS-1$
577-
if (i != null) {
578-
parameters.add("http.headerCacheSize", i.toString()); //$NON-NLS-1$
579-
}
580-
i = Integer.getInteger("com.arcadsoftware.http.outputBufferSize"); //$NON-NLS-1$
581-
if (i != null) {
582-
parameters.add("http.outputBufferSize", i.toString()); //$NON-NLS-1$
583-
}
584-
i = Integer.getInteger("com.arcadsoftware.lowResource.period"); //$NON-NLS-1$
585-
if (i != null) {
586-
parameters.add("lowResource.period", i.toString()); //$NON-NLS-1$
587-
}
588-
i = Integer.getInteger("com.arcadsoftware.lowResource.threads"); //$NON-NLS-1$
589-
if (i != null) {
590-
parameters.add("lowResource.threads", i.toString()); //$NON-NLS-1$
591-
}
592-
i = Integer.getInteger("com.arcadsoftware.lowResource.maxMemory"); //$NON-NLS-1$
593-
if (i != null) {
594-
parameters.add("lowResource.maxMemory", i.toString()); //$NON-NLS-1$
595-
}
596-
i = Integer.getInteger("com.arcadsoftware.lowResource.maxConnections"); //$NON-NLS-1$
597-
if (i != null) {
598-
parameters.add("lowResource.maxConnections", i.toString()); //$NON-NLS-1$
599-
}
600-
i = Integer.getInteger("com.arcadsoftware.lowResource.idleTimeout"); //$NON-NLS-1$
601-
if (i != null) {
602-
parameters.add("lowResource.idleTimeout", i.toString()); //$NON-NLS-1$
603-
}
604-
i = Integer.getInteger("com.arcadsoftware.lowResource.stopTimeout"); //$NON-NLS-1$
605-
if (i != null) {
606-
parameters.add("lowResource.stopTimeout", i.toString()); //$NON-NLS-1$
607-
}
608-
if (Boolean.getBoolean("com.arcadsoftware.useForwardedForHeader")) { //$NON-NLS-1$
609-
parameters.add("useForwardedForHeader", "true"); //$NON-NLS-1$ //$NON-NLS-2$
610-
}
611-
}
612-
613484
protected boolean isRestletLogDisabled() {
614485
// TODO Auto-generated method stub
615486
return (serverProps != null) && (serverProps.isServerInactive() || serverProps.isRestletLogDisabled());

0 commit comments

Comments
 (0)