From 40ae72d5e9f2e15ea2d1ac6bbed7f0f2e312cbdc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 1 Nov 2022 09:06:48 +0100 Subject: [PATCH] Move Equinox specific code to the appropriate variant --- Makefile | 2 +- .../equinox/org.argeo.cms.lib.equinox}/.classpath | 0 .../equinox/org.argeo.cms.lib.equinox}/.gitignore | 0 .../equinox/org.argeo.cms.lib.equinox}/.project | 0 .../equinox/org.argeo.cms.lib.equinox}/META-INF/.gitignore | 0 .../org.argeo.cms.lib.equinox}/OSGI-INF/jettyServiceFactory.xml | 0 .../equinox/org.argeo.cms.lib.equinox}/bnd.bnd | 0 .../equinox/org.argeo.cms.lib.equinox}/build.properties | 0 .../org/argeo/cms/equinox/http/jetty/EquinoxJettyServer.java | 0 .../src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java | 0 .../argeo/cms/servlet/internal/jetty/JettyHttpConstants.java | 0 .../src/org/argeo/equinox/jetty/CmsJettyCustomizer.java | 0 .../src/org/argeo/equinox/jetty/package-info.java | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/.classpath (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/.gitignore (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/.project (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/META-INF/.gitignore (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/OSGI-INF/jettyServiceFactory.xml (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/bnd.bnd (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/build.properties (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/src/org/argeo/cms/equinox/http/jetty/EquinoxJettyServer.java (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java (100%) rename {org.argeo.cms.lib.equinox => osgi/equinox/org.argeo.cms.lib.equinox}/src/org/argeo/equinox/jetty/package-info.java (100%) diff --git a/Makefile b/Makefile index 57bb5b38c..3d881b870 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,9 @@ org.argeo.cms \ org.argeo.cms.ux \ org.argeo.cms.ee \ org.argeo.cms.lib.jetty \ -org.argeo.cms.lib.equinox \ org.argeo.cms.lib.sshd \ org.argeo.cms.cli \ +osgi/equinox/org.argeo.cms.lib.equinox \ swt/org.argeo.swt.minidesktop \ swt/org.argeo.cms.swt \ swt/org.argeo.cms.e4 \ diff --git a/org.argeo.cms.lib.equinox/.classpath b/osgi/equinox/org.argeo.cms.lib.equinox/.classpath similarity index 100% rename from org.argeo.cms.lib.equinox/.classpath rename to osgi/equinox/org.argeo.cms.lib.equinox/.classpath diff --git a/org.argeo.cms.lib.equinox/.gitignore b/osgi/equinox/org.argeo.cms.lib.equinox/.gitignore similarity index 100% rename from org.argeo.cms.lib.equinox/.gitignore rename to osgi/equinox/org.argeo.cms.lib.equinox/.gitignore diff --git a/org.argeo.cms.lib.equinox/.project b/osgi/equinox/org.argeo.cms.lib.equinox/.project similarity index 100% rename from org.argeo.cms.lib.equinox/.project rename to osgi/equinox/org.argeo.cms.lib.equinox/.project diff --git a/org.argeo.cms.lib.equinox/META-INF/.gitignore b/osgi/equinox/org.argeo.cms.lib.equinox/META-INF/.gitignore similarity index 100% rename from org.argeo.cms.lib.equinox/META-INF/.gitignore rename to osgi/equinox/org.argeo.cms.lib.equinox/META-INF/.gitignore diff --git a/org.argeo.cms.lib.equinox/OSGI-INF/jettyServiceFactory.xml b/osgi/equinox/org.argeo.cms.lib.equinox/OSGI-INF/jettyServiceFactory.xml similarity index 100% rename from org.argeo.cms.lib.equinox/OSGI-INF/jettyServiceFactory.xml rename to osgi/equinox/org.argeo.cms.lib.equinox/OSGI-INF/jettyServiceFactory.xml diff --git a/org.argeo.cms.lib.equinox/bnd.bnd b/osgi/equinox/org.argeo.cms.lib.equinox/bnd.bnd similarity index 100% rename from org.argeo.cms.lib.equinox/bnd.bnd rename to osgi/equinox/org.argeo.cms.lib.equinox/bnd.bnd diff --git a/org.argeo.cms.lib.equinox/build.properties b/osgi/equinox/org.argeo.cms.lib.equinox/build.properties similarity index 100% rename from org.argeo.cms.lib.equinox/build.properties rename to osgi/equinox/org.argeo.cms.lib.equinox/build.properties diff --git a/org.argeo.cms.lib.equinox/src/org/argeo/cms/equinox/http/jetty/EquinoxJettyServer.java b/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/equinox/http/jetty/EquinoxJettyServer.java similarity index 100% rename from org.argeo.cms.lib.equinox/src/org/argeo/cms/equinox/http/jetty/EquinoxJettyServer.java rename to osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/equinox/http/jetty/EquinoxJettyServer.java diff --git a/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java b/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java similarity index 100% rename from org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java rename to osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java diff --git a/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java b/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java similarity index 100% rename from org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java rename to osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyHttpConstants.java diff --git a/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java b/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java similarity index 100% rename from org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java rename to osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java diff --git a/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/package-info.java b/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/package-info.java similarity index 100% rename from org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/package-info.java rename to osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/equinox/jetty/package-info.java -- 2.30.2