diff options
6 files changed, 56 insertions, 46 deletions
diff --git a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF index f244ce0ee..dd6782852 100644 --- a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: javax.servlet;version="[2.5.0,2.6.0)", org.osgi.service.cm;version="1.2.0", org.osgi.service.startlevel;version="1.0" Bundle-RequiredExecutionEnvironment: J2SE-1.4 -Export-Package: org.eclipse.equinox.http.jetty;version="1.0.0" +Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0" Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2 Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java index 42f237bdc..8a5b2a08c 100644 --- a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java +++ b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others + * Copyright (c) 2007, 2008 IBM Corporation and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,9 +12,9 @@ package org.eclipse.equinox.http.jetty; import java.security.Permission; import java.util.Dictionary; +import org.eclipse.equinox.http.jetty.internal.Activator; import org.osgi.framework.Constants; import org.osgi.service.cm.ConfigurationPermission; -import org.eclipse.equinox.http.jetty.internal.Activator; /** * <p> @@ -23,6 +23,8 @@ import org.eclipse.equinox.http.jetty.internal.Activator; * </p> * * @see org.eclipse.equinox.http.jetty.JettyConstants + * @noextend This class is not intended to be subclassed by clients. + * @noinstantiate This class is not intended to be instantiated by clients. */ public class JettyConfigurator { private static final String PID_PREFIX = "org.eclipse.equinox.http.jetty.JettyConfigurator."; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java index c76dd6ac5..a1d9da849 100644 --- a/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java +++ b/bundles/org.eclipse.equinox.http.jetty5/src/org/eclipse/equinox/http/jetty/JettyConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others + * Copyright (c) 2007, 2008 IBM Corporation and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,9 @@ package org.eclipse.equinox.http.jetty; * <p> * Provides configuration constants for use with JettyConfigurator. * </p> + * @since 1.1 + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. */ public interface JettyConstants { @@ -21,85 +24,85 @@ public interface JettyConstants { * name="http.enabled" type="Boolean" (default: true) */ public static final String HTTP_ENABLED = "http.enabled"; //$NON-NLS-1$ - + /** * name="http.port" type="Integer" (default: 0 -- first available port) */ public static final String HTTP_PORT = "http.port"; //$NON-NLS-1$ - + /** * name="http.host" type="String" (default: 0.0.0.0 -- all network adapters) */ public static final String HTTP_HOST = "http.host"; //$NON-NLS-1$ - + /** * name="https.enabled" type="Boolean" (default: false) */ public static final String HTTPS_ENABLED = "https.enabled"; //$NON-NLS-1$ - + /** - * name="https.port" type="Integer" (default: 0 -- first available port) + * name="https.host" type="String" (default: 0.0.0.0 -- all network adapters) */ public static final String HTTPS_HOST = "https.host"; //$NON-NLS-1$ - + /** - * name="https.host" type="String" (default: 0.0.0.0 -- all network adapters) + * name="https.port" type="Integer" (default: 0 -- first available port) */ public static final String HTTPS_PORT = "https.port"; //$NON-NLS-1$ - + /** * name="ssl.keystore" type="String" */ public static final String SSL_KEYSTORE = "ssl.keystore"; //$NON-NLS-1$ - + /** * name="ssl.password" type="String" */ public static final String SSL_PASSWORD = "ssl.password"; //$NON-NLS-1$ - + /** * name="ssl.keypassword" type="String" */ public static final String SSL_KEYPASSWORD = "ssl.keypassword"; //$NON-NLS-1$ - + /** * name="ssl.needclientauth" type="Boolean" */ public static final String SSL_NEEDCLIENTAUTH = "ssl.needclientauth"; //$NON-NLS-1$ - + /** * name="ssl.wantclientauth" type="Boolean" */ public static final String SSL_WANTCLIENTAUTH = "ssl.wantclientauth"; //$NON-NLS-1$ - + /** * name="ssl.protocol" type="String" */ public static final String SSL_PROTOCOL = "ssl.protocol"; //$NON-NLS-1$ - + /** * name="ssl.algorithm" type="String" */ public static final String SSL_ALGORITHM = "ssl.algorithm"; //$NON-NLS-1$ - + /** * name="ssl.keystoretype" type="String" */ public static final String SSL_KEYSTORETYPE = "ssl.keystoretype"; //$NON-NLS-1$ - + /** * name="context.path" type="String" */ public static final String CONTEXT_PATH = "context.path"; //$NON-NLS-1$ - + /** * name="context.sessioninactiveinterval" type="Integer" */ public static final String CONTEXT_SESSIONINACTIVEINTERVAL = "context.sessioninactiveinterval"; //$NON-NLS-1$ - + /** * name="other.info" type="String" */ public static final String OTHER_INFO = "other.info"; //$NON-NLS-1$ - + } diff --git a/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF index f244ce0ee..dd6782852 100644 --- a/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: javax.servlet;version="[2.5.0,2.6.0)", org.osgi.service.cm;version="1.2.0", org.osgi.service.startlevel;version="1.0" Bundle-RequiredExecutionEnvironment: J2SE-1.4 -Export-Package: org.eclipse.equinox.http.jetty;version="1.0.0" +Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0" Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2 Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java index 42f237bdc..8a5b2a08c 100644 --- a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java +++ b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConfigurator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others + * Copyright (c) 2007, 2008 IBM Corporation and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,9 +12,9 @@ package org.eclipse.equinox.http.jetty; import java.security.Permission; import java.util.Dictionary; +import org.eclipse.equinox.http.jetty.internal.Activator; import org.osgi.framework.Constants; import org.osgi.service.cm.ConfigurationPermission; -import org.eclipse.equinox.http.jetty.internal.Activator; /** * <p> @@ -23,6 +23,8 @@ import org.eclipse.equinox.http.jetty.internal.Activator; * </p> * * @see org.eclipse.equinox.http.jetty.JettyConstants + * @noextend This class is not intended to be subclassed by clients. + * @noinstantiate This class is not intended to be instantiated by clients. */ public class JettyConfigurator { private static final String PID_PREFIX = "org.eclipse.equinox.http.jetty.JettyConfigurator."; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java index c76dd6ac5..a1d9da849 100644 --- a/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java +++ b/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others + * Copyright (c) 2007, 2008 IBM Corporation and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,9 @@ package org.eclipse.equinox.http.jetty; * <p> * Provides configuration constants for use with JettyConfigurator. * </p> + * @since 1.1 + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. */ public interface JettyConstants { @@ -21,85 +24,85 @@ public interface JettyConstants { * name="http.enabled" type="Boolean" (default: true) */ public static final String HTTP_ENABLED = "http.enabled"; //$NON-NLS-1$ - + /** * name="http.port" type="Integer" (default: 0 -- first available port) */ public static final String HTTP_PORT = "http.port"; //$NON-NLS-1$ - + /** * name="http.host" type="String" (default: 0.0.0.0 -- all network adapters) */ public static final String HTTP_HOST = "http.host"; //$NON-NLS-1$ - + /** * name="https.enabled" type="Boolean" (default: false) */ public static final String HTTPS_ENABLED = "https.enabled"; //$NON-NLS-1$ - + /** - * name="https.port" type="Integer" (default: 0 -- first available port) + * name="https.host" type="String" (default: 0.0.0.0 -- all network adapters) */ public static final String HTTPS_HOST = "https.host"; //$NON-NLS-1$ - + /** - * name="https.host" type="String" (default: 0.0.0.0 -- all network adapters) + * name="https.port" type="Integer" (default: 0 -- first available port) */ public static final String HTTPS_PORT = "https.port"; //$NON-NLS-1$ - + /** * name="ssl.keystore" type="String" */ public static final String SSL_KEYSTORE = "ssl.keystore"; //$NON-NLS-1$ - + /** * name="ssl.password" type="String" */ public static final String SSL_PASSWORD = "ssl.password"; //$NON-NLS-1$ - + /** * name="ssl.keypassword" type="String" */ public static final String SSL_KEYPASSWORD = "ssl.keypassword"; //$NON-NLS-1$ - + /** * name="ssl.needclientauth" type="Boolean" */ public static final String SSL_NEEDCLIENTAUTH = "ssl.needclientauth"; //$NON-NLS-1$ - + /** * name="ssl.wantclientauth" type="Boolean" */ public static final String SSL_WANTCLIENTAUTH = "ssl.wantclientauth"; //$NON-NLS-1$ - + /** * name="ssl.protocol" type="String" */ public static final String SSL_PROTOCOL = "ssl.protocol"; //$NON-NLS-1$ - + /** * name="ssl.algorithm" type="String" */ public static final String SSL_ALGORITHM = "ssl.algorithm"; //$NON-NLS-1$ - + /** * name="ssl.keystoretype" type="String" */ public static final String SSL_KEYSTORETYPE = "ssl.keystoretype"; //$NON-NLS-1$ - + /** * name="context.path" type="String" */ public static final String CONTEXT_PATH = "context.path"; //$NON-NLS-1$ - + /** * name="context.sessioninactiveinterval" type="Integer" */ public static final String CONTEXT_SESSIONINACTIVEINTERVAL = "context.sessioninactiveinterval"; //$NON-NLS-1$ - + /** * name="other.info" type="String" */ public static final String OTHER_INFO = "other.info"; //$NON-NLS-1$ - + } |