Update Eclipse third-parties. Java 17 now working.

diff --git a/cms/org.argeo.cms.integration/bnd.bnd b/cms/org.argeo.cms.integration/bnd.bnd
index b17428a7822802ea41db62b4381d88b33860c7b7..0741af882dec89f128e0d8b233d87c1cec59414a 100644 (file)
--- a/cms/org.argeo.cms.integration/bnd.bnd
+++ b/cms/org.argeo.cms.integration/bnd.bnd
@@ -2,4 +2,5 @@ Import-Package:\
 javax.jcr.nodetype,\
 org.apache.commons.logging,\
 org.apache.jackrabbit.*;version="[1,4)",\
+javax.servlet.*;version="[3,5)",\
 *
\ No newline at end of file

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
index aea1f0a385a25e3c34b277e23990ecf7173f3f85..747afa4c10a1fe40dfb3b74024d22a1acd7372fd 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
@@ -1,115 +1,86 @@
 package org.argeo.cms.websocket;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.List;
-
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
-import javax.websocket.server.ServerEndpointConfig.Configurator;
-
-import org.argeo.api.cms.CmsAuth;
-import org.argeo.api.cms.CmsLog;
-import org.argeo.cms.auth.RemoteAuthCallbackHandler;
-import org.argeo.cms.auth.RemoteAuthSession;
-import org.argeo.cms.servlet.ServletHttpSession;
-import org.osgi.service.http.context.ServletContextHelper;
-
-/** Customises the initialisation of a new web socket. */
-public class CmsWebSocketConfigurator extends Configurator {
-       public final static String WEBSOCKET_SUBJECT = "org.argeo.cms.websocket.subject";
-
-       private final static CmsLog log = CmsLog.getLog(CmsWebSocketConfigurator.class);
-       final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
-
-       @Override
-       public boolean checkOrigin(String originHeaderValue) {
-               return true;
-       }
-
-       @Override
-       public <T> T getEndpointInstance(Class<T> endpointClass) throws InstantiationException {
-               try {
-                       return endpointClass.getDeclaredConstructor().newInstance();
-               } catch (Exception e) {
-                       throw new IllegalArgumentException("Cannot get endpoint instance", e);
-               }
-       }
-
-       @Override
-       public List<Extension> getNegotiatedExtensions(List<Extension> installed, List<Extension> requested) {
-               return requested;
-       }
-
-       @Override
-       public String getNegotiatedSubprotocol(List<String> supported, List<String> requested) {
-               if ((requested == null) || (requested.size() == 0))
-                       return "";
-               if ((supported == null) || (supported.isEmpty()))
-                       return "";
-               for (String possible : requested) {
-                       if (possible == null)
-                               continue;
-                       if (supported.contains(possible))
-                               return possible;
-               }
-               return "";
-       }
-
-       @Override
-       public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
-
-               RemoteAuthSession httpSession = new ServletHttpSession((javax.servlet.http.HttpSession) request.getHttpSession());
-               if (log.isDebugEnabled() && httpSession != null)
-                       log.debug("Web socket HTTP session id: " + httpSession.getId());
-
-               if (httpSession == null) {
-                       rejectResponse(response, null);
-               }
-               try {
-                       LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER,
-                                       new RemoteAuthCallbackHandler(httpSession));
-                       lc.login();
-                       if (log.isDebugEnabled())
-                               log.debug("Web socket logged-in as " + lc.getSubject());
-                       Subject.doAs(lc.getSubject(), new PrivilegedAction<Void>() {
-
-                               @Override
-                               public Void run() {
-                                       sec.getUserProperties().put(ServletContextHelper.REMOTE_USER, AccessController.getContext());
-                                       return null;
-                               }
-
-                       });
-               } catch (Exception e) {
-                       rejectResponse(response, e);
-               }
-       }
-
-       /**
-        * Behaviour when the web socket could not be authenticated. Throws an
-        * {@link IllegalStateException} by default.
-        * 
-        * @param e can be null
-        */
-       protected void rejectResponse(HandshakeResponse response, Exception e) {
-               // violent implementation, as suggested in
-               // https://stackoverflow.com/questions/21763829/jsr-356-how-to-abort-a-websocket-connection-during-the-handshake
-//             throw new IllegalStateException("Web socket cannot be authenticated");
-       }
-}
-
-//if (!webServerConfig.isEmpty()) {
-//webServerConfig.put("customizer.class", KernelConstants.CMS_JETTY_CUSTOMIZER_CLASS);
+/** <strong>Disabled until third party issues are solved.</strong>. Customises the initialisation of a new web socket. */
+public class CmsWebSocketConfigurator {
+//extends Configurator {
+//     public final static String WEBSOCKET_SUBJECT = "org.argeo.cms.websocket.subject";
+//
+//     private final static CmsLog log = CmsLog.getLog(CmsWebSocketConfigurator.class);
+//     final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate";
+//
+//     @Override
+//     public boolean checkOrigin(String originHeaderValue) {
+//             return true;
+//     }
+//
+//     @Override
+//     public <T> T getEndpointInstance(Class<T> endpointClass) throws InstantiationException {
+//             try {
+//                     return endpointClass.getDeclaredConstructor().newInstance();
+//             } catch (Exception e) {
+//                     throw new IllegalArgumentException("Cannot get endpoint instance", e);
+//             }
+//     }
+//
+//     @Override
+//     public List<Extension> getNegotiatedExtensions(List<Extension> installed, List<Extension> requested) {
+//             return requested;
+//     }
+//
+//     @Override
+//     public String getNegotiatedSubprotocol(List<String> supported, List<String> requested) {
+//             if ((requested == null) || (requested.size() == 0))
+//                     return "";
+//             if ((supported == null) || (supported.isEmpty()))
+//                     return "";
+//             for (String possible : requested) {
+//                     if (possible == null)
+//                             continue;
+//                     if (supported.contains(possible))
+//                             return possible;
+//             }
+//             return "";
+//     }
 //
-//// TODO centralise with Jetty extender
-//Object webSocketEnabled = webServerConfig.get(InternalHttpConstants.WEBSOCKET_ENABLED);
-//if (webSocketEnabled != null && webSocketEnabled.toString().equals("true")) {
-//     bc.registerService(ServerEndpointConfig.Configurator.class, new CmsWebSocketConfigurator(), null);
-//     webServerConfig.put(InternalHttpConstants.WEBSOCKET_ENABLED, "true");
-//}
-//}
+//     @Override
+//     public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
+//
+//             RemoteAuthSession httpSession = new ServletHttpSession((javax.servlet.http.HttpSession) request.getHttpSession());
+//             if (log.isDebugEnabled() && httpSession != null)
+//                     log.debug("Web socket HTTP session id: " + httpSession.getId());
+//
+//             if (httpSession == null) {
+//                     rejectResponse(response, null);
+//             }
+//             try {
+//                     LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER,
+//                                     new RemoteAuthCallbackHandler(httpSession));
+//                     lc.login();
+//                     if (log.isDebugEnabled())
+//                             log.debug("Web socket logged-in as " + lc.getSubject());
+//                     Subject.doAs(lc.getSubject(), new PrivilegedAction<Void>() {
+//
+//                             @Override
+//                             public Void run() {
+//                                     sec.getUserProperties().put(ServletContextHelper.REMOTE_USER, AccessController.getContext());
+//                                     return null;
+//                             }
+//
+//                     });
+//             } catch (Exception e) {
+//                     rejectResponse(response, e);
+//             }
+//     }
+//
+//     /**
+//      * Behaviour when the web socket could not be authenticated. Throws an
+//      * {@link IllegalStateException} by default.
+//      * 
+//      * @param e can be null
+//      */
+//     protected void rejectResponse(HandshakeResponse response, Exception e) {
+//             // violent implementation, as suggested in
+//             // https://stackoverflow.com/questions/21763829/jsr-356-how-to-abort-a-websocket-connection-during-the-handshake
+////           throw new IllegalStateException("Web socket cannot be authenticated");
+//     }
+}

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index 7d269d17cd93a04036525e98615a123425341eb0..db505a1e56fd3d3a973d2a5df70eaa2d4b9f1617 100644 (file)
--- a/cnf/argeo.bnd
+++ b/cnf/argeo.bnd
@@ -3,6 +3,7 @@ Bundle-Version: ${version.released}${qualifier}
 Private-Package: *.internal.*
 Export-Package: !*.internal.*, *
 #-consumer-policy : ${range;[==,=+)}
+-contract: !JavaServlet,*
 -savemanifest : META-INF/MANIFEST.MF
 -includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
 -compression STORE

diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
index 9c97e5fca2817e8134c730889fec92e360bbdb60..7a6e6a21547ebfd6dca71df4fbc0b1f898acaa00 100644 (file)
--- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
+++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
@@ -66,6 +66,8 @@ public class A2Factory {
                // TODO make it configurable
                List<String> eclipseMirrors = new ArrayList<>();
                eclipseMirrors.add("https://archive.eclipse.org/");
+               eclipseMirrors.add("http://ftp-stud.hs-esslingen.de/Mirrors/eclipse/");
+               eclipseMirrors.add("http://ftp.fau.de/eclipse/");
 
                mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors);
        }
@@ -619,8 +621,9 @@ public class A2Factory {
                Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
 
 //             factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
-               factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
-//             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jcr/oak"));
+//             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
+               factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty"));
+               factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty-websocket"));
                System.exit(0);
 
                // Eclipse
@@ -629,6 +632,8 @@ public class A2Factory {
                factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap"));
                factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
 
+               System.exit(0);
+
                // Maven
                factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
                factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));

diff --git a/tp/org.argeo.tp.apache/org.apache.lucene.bnd b/tp/org.argeo.tp.apache/org.apache.lucene.bnd
deleted file mode 100644 (file)
index 8126ffd..0000000
--- a/tp/org.argeo.tp.apache/org.apache.lucene.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.lucene
-SLC-Origin-M2: org.apache.lucene:lucene-core:3.6.2
\ No newline at end of file

diff --git a/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd b/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd
deleted file mode 100644 (file)
index 83d6d31..0000000
--- a/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-License: Apache-2.0
-Bundle-SymbolicName: org.apache.xmlbeans
-DynamicImport-Package: *
-Import-Package: org.apache.tools.ant.*;resolution:=optional,
-net.sf.saxon.*;resolution:=optional,
-com.sun.*;resolution:=optional,
-*
-SLC-Origin-M2: org.apache.xmlbeans:xmlbeans:3.1.0
\ No newline at end of file

diff --git a/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd.retired b/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd.retired
new file mode 100644 (file)
index 0000000..83d6d31
--- /dev/null
+++ b/tp/org.argeo.tp.apache/org.apache.xmlbeans.bnd.retired
@@ -0,0 +1,8 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.xmlbeans
+DynamicImport-Package: *
+Import-Package: org.apache.tools.ant.*;resolution:=optional,
+net.sf.saxon.*;resolution:=optional,
+com.sun.*;resolution:=optional,
+*
+SLC-Origin-M2: org.apache.xmlbeans:xmlbeans:3.1.0
\ No newline at end of file

diff --git a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd
index 1c21a1c40c2f2ea12c8de6bbb7dd31e86b82ac99..4411b9a240ffb5465392c5525defd460721425dd 100644 (file)
--- a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd
+++ b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/common.bnd
@@ -1,3 +1,3 @@
 Bundle-License: EPL-1.0
 SLC-Origin-ManifestNotModified: true
-SLC-Origin-URI: http://www.eclipse.org/downloads/equinox/drops/R-4.13-201909161045/equinox-SDK-4.13.zip
+SLC-Origin-URI: http://www.eclipse.org/downloads/equinox/drops/R-4.22-202111241800/equinox-SDK-4.22.zip

diff --git a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties
index 5fa176e121f0e0920bb3a941b1d610033ed7575b..06cc3e96d93ef5fe629c991f173399aa9f19a0ad 100644 (file)
--- a/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties
+++ b/tp/org.argeo.tp.eclipse.equinox/eclipse-equinox/includes.properties
@@ -2,11 +2,9 @@ plugins/org.eclipse.osgi_*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.osgi.source_*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.osgi.util*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.osgi.services*.jar=org.argeo.tp.eclipse.equinox
-plugins/javax.servlet*.jar=org.argeo.tp.javax
-plugins/javax.el*.jar=org.argeo.tp.javax
+plugins/jakarta.servlet-api*.jar=org.argeo.tp.javax
 plugins/org.apache.felix.gogo.*.jar=org.argeo.tp.apache.felix
 plugins/org.apache.felix.scr*.jar=org.argeo.tp.apache.felix
-plugins/org.apache.jasper.*.jar=org.argeo.tp.apache
 plugins/org.eclipse.equinox.app*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.equinox.cm*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.equinox.common*.jar=org.argeo.tp.eclipse.equinox
@@ -23,4 +21,3 @@ plugins/org.eclipse.equinox.preferences*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.equinox.registry*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.equinox.servletbridge*.jar=org.argeo.tp.eclipse.equinox
 plugins/org.eclipse.equinox.util*.jar=org.argeo.tp.eclipse.equinox
-plugins/org.eclipse.equinox.jsp.*.jar=org.argeo.tp.eclipse.equinox

diff --git a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd
index 1fec907d9622d8d257f2b0e6be8b26f2d7d81909..5c332a0409225bc9e9770a6af512d4e3b1e90e31 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd
+++ b/tp/org.argeo.tp.eclipse.rap/eclipse-rap/common.bnd
@@ -1,3 +1,3 @@
 Bundle-License: EPL-1.0
 SLC-Origin-ManifestNotModified: true
-SLC-Origin-URI: http://www.eclipse.org/downloads/rt/rap/3.10/e4/rap-e4-3.10.0-R-20190911-1524.zip
+SLC-Origin-URI: http://www.eclipse.org/downloads/rt/rap/3.19/e4/rap-e4-3.19.0-R-20211130-1934.zip

diff --git a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd
index 4d63302d0d34cb203f7e3dc41453d858435c3919..e290997451655f0391ecc33fec5ed21bb1bb220e 100644 (file)
--- a/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd
+++ b/tp/org.argeo.tp.eclipse.rcp/eclipse-rcp/common.bnd
@@ -1,3 +1,3 @@
 Bundle-License: EPL-1.0
 SLC-Origin-ManifestNotModified: true
-SLC-Origin-URI: http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.13-201909161045/org.eclipse.rcp.source-4.13.zip
+SLC-Origin-URI: http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.22-202111241800/org.eclipse.rcp.source-4.22.zip

diff --git a/tp/org.argeo.tp.jcr/org.apache.lucene.bnd b/tp/org.argeo.tp.jcr/org.apache.lucene.bnd
new file mode 100644 (file)
index 0000000..8126ffd
--- /dev/null
+++ b/tp/org.argeo.tp.jcr/org.apache.lucene.bnd
@@ -0,0 +1,3 @@
+Bundle-License: Apache-2.0
+Bundle-SymbolicName: org.apache.lucene
+SLC-Origin-M2: org.apache.lucene:lucene-core:3.6.2
\ No newline at end of file

diff --git a/tp/org.argeo.tp.jetty.websocket/javax.websocket.bnd b/tp/org.argeo.tp.jetty.websocket/javax.websocket.bnd
new file mode 100644 (file)
index 0000000..cefcff8
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/javax.websocket.bnd
@@ -0,0 +1,4 @@
+Bundle-SymbolicName: javax.websocket
+Bundle-License: GPL-2.0-only OR CDDL-1.1
+SLC-Origin-M2: javax.websocket:javax.websocket-api:1.1
+SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/common.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/common.bnd
new file mode 100644 (file)
index 0000000..c26721c
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/common.bnd
@@ -0,0 +1,2 @@
+Bundle-License: Apache-2.0
+SLC-Origin-M2: :10.0.8

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.api.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.api.bnd
new file mode 100644 (file)
index 0000000..3723f35
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.api.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-jetty-api
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.api

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.client.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.client.bnd
new file mode 100644 (file)
index 0000000..12795c3
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.client.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-jetty-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.client

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.common.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.common.bnd
new file mode 100644 (file)
index 0000000..d97b5e7
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.common.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-jetty-common
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.common

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.client.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.client.bnd
new file mode 100644 (file)
index 0000000..e6f4338
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.client.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-core-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.core.client

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.common.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.common.bnd
new file mode 100644 (file)
index 0000000..9d8bbe9
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.common.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-core-common
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.core.common

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.server.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.server.bnd
new file mode 100644 (file)
index 0000000..e6f4338
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.core.server.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-core-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.core.client

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.client.bnd.disabled b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.client.bnd.disabled
new file mode 100644 (file)
index 0000000..29ee719
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.client.bnd.disabled
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-jakarta-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.jakarta.client

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.common.bnd.disabled b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.common.bnd.disabled
new file mode 100644 (file)
index 0000000..b2d60af
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.common.bnd.disabled
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-jakarta-common
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.jakarta.common

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.server.bnd.disabled b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.server.bnd.disabled
new file mode 100644 (file)
index 0000000..999440a
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.jakarta.websocket.server.bnd.disabled
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-jakarta-server
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.jakarta.server

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.server.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.server.bnd
new file mode 100644 (file)
index 0000000..c515899
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.server.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-jetty-server
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.server

diff --git a/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd
new file mode 100644 (file)
index 0000000..3db77e2
--- /dev/null
+++ b/tp/org.argeo.tp.jetty.websocket/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-servlet
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.servlet

diff --git a/tp/org.argeo.tp.jetty/javax.websocket.bnd b/tp/org.argeo.tp.jetty/javax.websocket.bnd
deleted file mode 100644 (file)
index cefcff8..0000000
--- a/tp/org.argeo.tp.jetty/javax.websocket.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-SymbolicName: javax.websocket
-Bundle-License: GPL-2.0-only OR CDDL-1.1
-SLC-Origin-M2: javax.websocket:javax.websocket-api:1.1
-SLC-Origin-ManifestNotModified: true

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd
deleted file mode 100644 (file)
index 4c515ce..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: :9.4.45.v20220203

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.api.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.api.bnd
deleted file mode 100644 (file)
index 3de1e46..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.api.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-api
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.api

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd
deleted file mode 100644 (file)
index 674c775..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.client.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-client
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.client

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd
deleted file mode 100644 (file)
index 7e7a113..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.common.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-common
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.common

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd
deleted file mode 100644 (file)
index 1007784..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-client-impl
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd
deleted file mode 100644 (file)
index 72860e3..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.javax.websocket.server.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-server-impl
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket.server

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd
deleted file mode 100644 (file)
index b9cad3c..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.server.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-server
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.server

diff --git a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd b/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd
deleted file mode 100644 (file)
index 3db77e2..0000000
--- a/tp/org.argeo.tp.jetty/jetty-websocket/org.eclipse.jetty.websocket.servlet.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-servlet
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.websocket.servlet

diff --git a/tp/org.argeo.tp.jetty/jetty/common.bnd b/tp/org.argeo.tp.jetty/jetty/common.bnd
index 4c515ce02f6e992e45b50e656a807acfcaf7b6b4..c26721c9fabe8a86606bda6f8a28614b9731e666 100644 (file)
--- a/tp/org.argeo.tp.jetty/jetty/common.bnd
+++ b/tp/org.argeo.tp.jetty/jetty/common.bnd
@@ -1,2 +1,2 @@
 Bundle-License: Apache-2.0
-SLC-Origin-M2: :9.4.45.v20220203
+SLC-Origin-M2: :10.0.8

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd
deleted file mode 100644 (file)
index 8bce1ab..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-client
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.client

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd.retired b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd.retired
new file mode 100644 (file)
index 0000000..8bce1ab
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd.retired
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.client

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd
deleted file mode 100644 (file)
index 5cf169d..0000000
--- a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-continuation
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.continuation

diff --git a/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired
new file mode 100644 (file)
index 0000000..5cf169d
--- /dev/null
+++ b/tp/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-continuation
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.continuation