From 881ae506ee03edcf801ab02775c50cbfb7cc2e17 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 8 Feb 2022 10:58:14 +0100 Subject: [PATCH] Rename factory projects + deb packages for TP --- Makefile | 35 ++++++++++++++----- org.argeo.slc.build/bnd.bnd | 0 .../argeo/slc/build/A2DistributionUnit.java | 9 ----- .../slc/build/bnd/BndManifestFactory.java | 5 --- org.argeo.slc.factory/.classpath | 4 +-- org.argeo.slc.factory/.project | 2 +- org.argeo.slc.factory/bnd.bnd | 5 --- .../build.properties | 0 .../src/org/argeo/slc/factory}/A2Factory.java | 14 ++++---- .../org/argeo/slc/factory}/m2/Artifact.java | 2 +- .../slc/factory}/m2/DefaultArtifact.java | 2 +- .../factory}/m2/MavenConventionsUtils.java | 2 +- .../.classpath | 4 +-- .../.gitignore | 0 .../.project | 4 +-- .../META-INF/.gitignore | 0 org.argeo.slc.rpmfactory/bnd.bnd | 5 +++ .../pom.xml | 0 .../org/argeo/slc/rpmfactory/RpmFactory.java | 0 .../argeo/slc/rpmfactory/RpmProxyService.java | 0 .../argeo/slc/rpmfactory/RpmRepository.java | 0 .../core/AbstractRpmRepository.java | 0 .../slc/rpmfactory/core/BuildInMock.java | 0 .../core/CreateRpmDistribution.java | 0 .../slc/rpmfactory/core/ReleaseStaging.java | 0 .../slc/rpmfactory/core/RpmDistribution.java | 0 .../slc/rpmfactory/core/RpmFactoryImpl.java | 0 .../argeo/slc/rpmfactory/core/RpmIndexer.java | 0 .../slc/rpmfactory/core/RpmPackageSet.java | 0 .../rpmfactory/core/RpmProxyServiceImpl.java | 0 .../slc/rpmfactory/core/RpmSpecFile.java | 0 .../rpmfactory/core/StagingRpmRepository.java | 0 .../core/ThirdPartyRpmRepository.java | 0 .../slc/rpmfactory/core/YumListParser.java | 0 pom.xml | 2 +- sdk/argeo-tp-rap.target | 14 ++++---- sdk/deb.mk | 34 ++++++++++++++++++ sdk/deb/argeo-tp-base.control | 5 +++ sdk/deb/argeo-tp-equinox.control | 5 +++ sdk/deb/argeo-tp-jcr.control | 5 +++ sdk/deb/argeo-tp-jetty.control | 5 +++ sdk/deb/argeo-tp-rap.control | 5 +++ sdk/deb/argeo-tp-sdk.control | 5 +++ sdk/includes.mk | 1 + sdk/output-argeo-tp-rap.target | 13 +++++++ tp/Make.java | 32 +++++++++++++++++ 46 files changed, 168 insertions(+), 51 deletions(-) delete mode 100644 org.argeo.slc.build/bnd.bnd delete mode 100644 org.argeo.slc.build/src/org/argeo/slc/build/A2DistributionUnit.java delete mode 100644 org.argeo.slc.build/src/org/argeo/slc/build/bnd/BndManifestFactory.java rename {org.argeo.slc.build => org.argeo.slc.factory}/build.properties (100%) rename {org.argeo.slc.build/src/org/argeo/slc/build => org.argeo.slc.factory/src/org/argeo/slc/factory}/A2Factory.java (98%) rename {org.argeo.slc.build/src/org/argeo/slc/build => org.argeo.slc.factory/src/org/argeo/slc/factory}/m2/Artifact.java (89%) rename {org.argeo.slc.build/src/org/argeo/slc/build => org.argeo.slc.factory/src/org/argeo/slc/factory}/m2/DefaultArtifact.java (96%) rename {org.argeo.slc.build/src/org/argeo/slc/build => org.argeo.slc.factory/src/org/argeo/slc/factory}/m2/MavenConventionsUtils.java (99%) rename {org.argeo.slc.build => org.argeo.slc.rpmfactory}/.classpath (78%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/.gitignore (100%) rename {org.argeo.slc.build => org.argeo.slc.rpmfactory}/.project (94%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/META-INF/.gitignore (100%) create mode 100644 org.argeo.slc.rpmfactory/bnd.bnd rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/pom.xml (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/RpmFactory.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/RpmProxyService.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/RpmRepository.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/BuildInMock.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/RpmDistribution.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/RpmIndexer.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/RpmPackageSet.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java (100%) rename {org.argeo.slc.factory => org.argeo.slc.rpmfactory}/src/org/argeo/slc/rpmfactory/core/YumListParser.java (100%) create mode 100644 sdk/deb.mk create mode 100644 sdk/deb/argeo-tp-base.control create mode 100644 sdk/deb/argeo-tp-equinox.control create mode 100644 sdk/deb/argeo-tp-jcr.control create mode 100644 sdk/deb/argeo-tp-jetty.control create mode 100644 sdk/deb/argeo-tp-rap.control create mode 100644 sdk/deb/argeo-tp-sdk.control create mode 100644 sdk/output-argeo-tp-rap.target create mode 100644 tp/Make.java diff --git a/Makefile b/Makefile index d6bda7804..fb4e41880 100644 --- a/Makefile +++ b/Makefile @@ -3,14 +3,14 @@ include sdk.mk all: osgi -BUNDLE_PREFIX = org.argeo -A2_CATEGORY = org.argeo +BUNDLE_PREFIX = org.argeo.slc +A2_CATEGORY = org.argeo.slc BUNDLES = \ org.argeo.slc.api \ -org.argeo.slc.build \ +org.argeo.slc.factory \ -BUILD_CLASSPATH = \ +BUILD_CLASSPATH_FEDORA = \ /usr/share/java/osgi-core/osgi.core.jar:$\ /usr/share/java/osgi-compendium/osgi.cmpn.jar:$\ /usr/share/java/ecj/ecj.jar:$\ @@ -20,15 +20,34 @@ BUILD_CLASSPATH = \ /usr/share/java/commons-cli.jar:$\ /usr/share/java/commons-exec.jar:$\ +BUILD_CLASSPATH = \ +/usr/share/java/osgi.core.jar:$\ +/usr/share/java/osgi.cmpn.jar:$\ +/usr/share/java/ecj.jar:$\ +/usr/share/java/bndlib.jar:$\ +/usr/share/java/slf4j-api.jar:$\ +/usr/share/java/commons-io.jar:$\ +/usr/share/java/commons-cli.jar:$\ +/usr/share/java/commons-exec.jar:$\ + +DISTRIBUTION_CLASSPATH = \ +$(SDK_BUILD_BASE)/a2/org.argeo.slc/org.argeo.slc.api.$(MAJOR).$(MINOR).jar:$\ +$(SDK_BUILD_BASE)/a2/org.argeo.slc/org.argeo.slc.factory.$(MAJOR).$(MINOR).jar:$\ +/usr/share/java/bndlib.jar:$\ +/usr/share/java/slf4j-api.jar + # TODO relativize from SDK_SRC_BASE BUILD_BASE = $(SDK_BUILD_BASE) +distribution: osgi + $(JVM) -cp $(DISTRIBUTION_CLASSPATH) tp/Make.java + # # GENERIC # -JVM := /usr/lib/jvm/jre-11/bin/java -JAVADOC := /usr/lib/jvm/jre-11/bin/javadoc -ECJ_JAR := /usr/share/java/ecj/ecj.jar +JVM := /usr/bin/java +JAVADOC := /usr/bin/javadoc +ECJ_JAR := /usr/share/java/ecj.jar BND_TOOL := /usr/bin/bnd WORKSPACE_BNDS := $(shell cd $(SDK_SRC_BASE) && find cnf -name '*.bnd') @@ -77,7 +96,7 @@ $(BUILD_BASE)/%/bundle.jar : %/bnd.bnd $(BUILD_BASE)/java-compiled mv $(dir $@)generated/*.jar $(dir $@)bundle.jar $(BUILD_BASE)/java-compiled : $(JAVA_SRCS) - $(JVM) -jar $(ECJ_JAR) -11 -nowarn -time -cp $(BUILD_CLASSPATH) \ + $(JVM) -cp $(ECJ_JAR) org.eclipse.jdt.internal.compiler.batch.Main -11 -nowarn -time -cp $(BUILD_CLASSPATH) \ $(ECJ_SRCS) touch $@ diff --git a/org.argeo.slc.build/bnd.bnd b/org.argeo.slc.build/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/A2DistributionUnit.java b/org.argeo.slc.build/src/org/argeo/slc/build/A2DistributionUnit.java deleted file mode 100644 index f822e7f70..000000000 --- a/org.argeo.slc.build/src/org/argeo/slc/build/A2DistributionUnit.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.argeo.slc.build; - -import org.argeo.slc.DefaultCategoryNameVersion; - -public class A2DistributionUnit extends DefaultCategoryNameVersion { - private String originVersion; - - -} diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/bnd/BndManifestFactory.java b/org.argeo.slc.build/src/org/argeo/slc/build/bnd/BndManifestFactory.java deleted file mode 100644 index f988c9e9d..000000000 --- a/org.argeo.slc.build/src/org/argeo/slc/build/bnd/BndManifestFactory.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.argeo.slc.build.bnd; - -public class BndManifestFactory { - -} diff --git a/org.argeo.slc.factory/.classpath b/org.argeo.slc.factory/.classpath index bc86c4239..e801ebfb4 100644 --- a/org.argeo.slc.factory/.classpath +++ b/org.argeo.slc.factory/.classpath @@ -1,7 +1,7 @@ - + - >> + diff --git a/org.argeo.slc.factory/.project b/org.argeo.slc.factory/.project index 948356fd0..d0f4daf39 100644 --- a/org.argeo.slc.factory/.project +++ b/org.argeo.slc.factory/.project @@ -22,7 +22,7 @@ - org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature diff --git a/org.argeo.slc.factory/bnd.bnd b/org.argeo.slc.factory/bnd.bnd index 35c4c44cb..e69de29bb 100644 --- a/org.argeo.slc.factory/bnd.bnd +++ b/org.argeo.slc.factory/bnd.bnd @@ -1,5 +0,0 @@ -Import-Package: javax.jcr.nodetype,\ -org.argeo.slc.repo,\ -org.osgi.*;version=0.0.0,\ -* - \ No newline at end of file diff --git a/org.argeo.slc.build/build.properties b/org.argeo.slc.factory/build.properties similarity index 100% rename from org.argeo.slc.build/build.properties rename to org.argeo.slc.factory/build.properties diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java similarity index 98% rename from org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java rename to org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java index dcf706299..c482f2745 100644 --- a/org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java @@ -1,4 +1,4 @@ -package org.argeo.slc.build; +package org.argeo.slc.factory; import static java.lang.System.Logger.Level.DEBUG; import static org.argeo.slc.ManifestConstants.BUNDLE_LICENSE; @@ -40,12 +40,13 @@ import java.util.jar.Manifest; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.ManifestConstants; import org.argeo.slc.NameVersion; -import org.argeo.slc.build.m2.DefaultArtifact; -import org.argeo.slc.build.m2.MavenConventionsUtils; +import org.argeo.slc.factory.m2.DefaultArtifact; +import org.argeo.slc.factory.m2.MavenConventionsUtils; import aQute.bnd.osgi.Analyzer; import aQute.bnd.osgi.Jar; +/** The central class for A2 packaging. */ public class A2Factory { private final static Logger logger = System.getLogger(A2Factory.class.getName()); @@ -250,7 +251,8 @@ public class A2Factory { case "Created-By": continue keys; } - if("Require-Capability".equals(key.toString()) && value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) + if ("Require-Capability".equals(key.toString()) + && value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) continue keys;// hack for very old classes additionalEntries.put(key.toString(), value.toString()); logger.log(DEBUG, () -> key + "=" + value); @@ -323,7 +325,7 @@ public class A2Factory { String url = commonProps.getProperty(ManifestConstants.SLC_ORIGIN_URI.toString()); Path downloaded = tryDownload(url, originBase); - FileSystem zipFs = FileSystems.newFileSystem(downloaded, null); + FileSystem zipFs = FileSystems.newFileSystem(downloaded, (ClassLoader) null); List pathMatchers = new ArrayList<>(); for (Object pattern : includes.keySet()) { @@ -430,7 +432,7 @@ public class A2Factory { // copy MANIFEST Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); Files.createDirectories(manifestPath.getParent()); - for (String key : entries.keySet()) { + for (String key : entries.keySet()) { String value = entries.get(key); Object previousValue = manifest.getMainAttributes().putValue(key, value); if (previousValue != null && !previousValue.equals(value)) { diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/m2/Artifact.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/Artifact.java similarity index 89% rename from org.argeo.slc.build/src/org/argeo/slc/build/m2/Artifact.java rename to org.argeo.slc.factory/src/org/argeo/slc/factory/m2/Artifact.java index 2d485b8de..9189f080e 100644 --- a/org.argeo.slc.build/src/org/argeo/slc/build/m2/Artifact.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/Artifact.java @@ -1,4 +1,4 @@ -package org.argeo.slc.build.m2; +package org.argeo.slc.factory.m2; public interface Artifact { String getGroupId(); diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/m2/DefaultArtifact.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/DefaultArtifact.java similarity index 96% rename from org.argeo.slc.build/src/org/argeo/slc/build/m2/DefaultArtifact.java rename to org.argeo.slc.factory/src/org/argeo/slc/factory/m2/DefaultArtifact.java index bf9782216..0c3b0c193 100644 --- a/org.argeo.slc.build/src/org/argeo/slc/build/m2/DefaultArtifact.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/DefaultArtifact.java @@ -1,4 +1,4 @@ -package org.argeo.slc.build.m2; +package org.argeo.slc.factory.m2; import org.argeo.slc.DefaultCategoryNameVersion; diff --git a/org.argeo.slc.build/src/org/argeo/slc/build/m2/MavenConventionsUtils.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/MavenConventionsUtils.java similarity index 99% rename from org.argeo.slc.build/src/org/argeo/slc/build/m2/MavenConventionsUtils.java rename to org.argeo.slc.factory/src/org/argeo/slc/factory/m2/MavenConventionsUtils.java index 1790775ec..3b7ebbb45 100644 --- a/org.argeo.slc.build/src/org/argeo/slc/build/m2/MavenConventionsUtils.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/MavenConventionsUtils.java @@ -1,4 +1,4 @@ -package org.argeo.slc.build.m2; +package org.argeo.slc.factory.m2; import java.io.File; import java.net.MalformedURLException; diff --git a/org.argeo.slc.build/.classpath b/org.argeo.slc.rpmfactory/.classpath similarity index 78% rename from org.argeo.slc.build/.classpath rename to org.argeo.slc.rpmfactory/.classpath index e801ebfb4..bc86c4239 100644 --- a/org.argeo.slc.build/.classpath +++ b/org.argeo.slc.rpmfactory/.classpath @@ -1,7 +1,7 @@ - + - + >> diff --git a/org.argeo.slc.factory/.gitignore b/org.argeo.slc.rpmfactory/.gitignore similarity index 100% rename from org.argeo.slc.factory/.gitignore rename to org.argeo.slc.rpmfactory/.gitignore diff --git a/org.argeo.slc.build/.project b/org.argeo.slc.rpmfactory/.project similarity index 94% rename from org.argeo.slc.build/.project rename to org.argeo.slc.rpmfactory/.project index 29c4c9ef0..29bc99a2f 100644 --- a/org.argeo.slc.build/.project +++ b/org.argeo.slc.rpmfactory/.project @@ -1,6 +1,6 @@ - org.argeo.slc.build + org.argeo.slc.rpmfactory @@ -22,7 +22,7 @@ - org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature diff --git a/org.argeo.slc.factory/META-INF/.gitignore b/org.argeo.slc.rpmfactory/META-INF/.gitignore similarity index 100% rename from org.argeo.slc.factory/META-INF/.gitignore rename to org.argeo.slc.rpmfactory/META-INF/.gitignore diff --git a/org.argeo.slc.rpmfactory/bnd.bnd b/org.argeo.slc.rpmfactory/bnd.bnd new file mode 100644 index 000000000..35c4c44cb --- /dev/null +++ b/org.argeo.slc.rpmfactory/bnd.bnd @@ -0,0 +1,5 @@ +Import-Package: javax.jcr.nodetype,\ +org.argeo.slc.repo,\ +org.osgi.*;version=0.0.0,\ +* + \ No newline at end of file diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.rpmfactory/pom.xml similarity index 100% rename from org.argeo.slc.factory/pom.xml rename to org.argeo.slc.rpmfactory/pom.xml diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmFactory.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/RpmFactory.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmFactory.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/RpmFactory.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmProxyService.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/RpmProxyService.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmProxyService.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/RpmProxyService.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmRepository.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/RpmRepository.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/RpmRepository.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/RpmRepository.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/AbstractRpmRepository.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmDistribution.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmDistribution.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmDistribution.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmDistribution.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmIndexer.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmIndexer.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmIndexer.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmIndexer.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmPackageSet.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmPackageSet.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmPackageSet.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmPackageSet.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/StagingRpmRepository.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/ThirdPartyRpmRepository.java diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java b/org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/YumListParser.java similarity index 100% rename from org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java rename to org.argeo.slc.rpmfactory/src/org/argeo/slc/rpmfactory/core/YumListParser.java diff --git a/pom.xml b/pom.xml index 0127ee601..dbccb64e6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.argeo.slc.runtime org.argeo.slc.jcr org.argeo.slc.repo - org.argeo.slc.factory + org.argeo.slc.rpmfactory cms diff --git a/sdk/argeo-tp-rap.target b/sdk/argeo-tp-rap.target index aaa5b323d..81c9e8172 100644 --- a/sdk/argeo-tp-rap.target +++ b/sdk/argeo-tp-rap.target @@ -2,12 +2,12 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/sdk/deb.mk b/sdk/deb.mk new file mode 100644 index 000000000..8a0f4e19e --- /dev/null +++ b/sdk/deb.mk @@ -0,0 +1,34 @@ +DIST_PKGS = \ +argeo-tp-base \ +argeo-tp-equinox \ +argeo-tp-jetty \ +argeo-tp-rap \ +argeo-tp-jcr \ +argeo-tp-sdk \ + +DEB_DIRS = $(DIST_PKGS:%=$(SDK_BUILD_BASE)/build/deb/%) +DEB_PKGS = $(DIST_PKGS:%=$(SDK_BUILD_BASE)/deb/%.deb) + + +deb: $(DEB_PKGS) + cd $(SDK_BUILD_BASE)/deb && dpkg-scanpackages . | gzip > Packages.gz + +$(SDK_BUILD_BASE)/deb/%.deb : $(SDK_BUILD_BASE)/build/deb/%/DEBIAN/control + echo Build $@ + +$(SDK_BUILD_BASE)/build/deb/%/DEBIAN/control : $(SDK_SRC_BASE)/sdk/deb/%.control prepare-deb + cp $< $@ + dpkg-deb --build --root-owner-group $(dir $@)/.. $(SDK_BUILD_BASE)/deb + +prepare-deb: + mkdir -p $(foreach deb_dir, $(DEB_DIRS), $(deb_dir)/DEBIAN) + mkdir -p $(foreach deb_dir, $(DEB_DIRS), $(deb_dir)/usr/share/a2) + rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp $(SDK_BUILD_BASE)/build/deb/argeo-tp-base/usr/share/a2 + rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.apache $(SDK_BUILD_BASE)/build/deb/argeo-tp-base/usr/share/a2 + rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.eclipse.equinox $(SDK_BUILD_BASE)/build/deb/argeo-tp-equinox/usr/share/a2 + rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.jetty $(SDK_BUILD_BASE)/build/deb/argeo-tp-jetty/usr/share/a2 + rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.eclipse.rap $(SDK_BUILD_BASE)/build/deb/argeo-tp-rap/usr/share/a2 + rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.jcr $(SDK_BUILD_BASE)/build/deb/argeo-tp-jcr/usr/share/a2 + rsync -av $(SDK_BUILD_BASE)/a2/org.argeo.tp.sdk $(SDK_BUILD_BASE)/build/deb/argeo-tp-sdk/usr/share/a2 + + diff --git a/sdk/deb/argeo-tp-base.control b/sdk/deb/argeo-tp-base.control new file mode 100644 index 000000000..2e65fbd6f --- /dev/null +++ b/sdk/deb/argeo-tp-base.control @@ -0,0 +1,5 @@ +Package: argeo-tp-base +Version: 2.3.4 +Architecture: all +Maintainer: Mathieu Baudier +Description: Base third parties which are GPL compatible diff --git a/sdk/deb/argeo-tp-equinox.control b/sdk/deb/argeo-tp-equinox.control new file mode 100644 index 000000000..01d6631e8 --- /dev/null +++ b/sdk/deb/argeo-tp-equinox.control @@ -0,0 +1,5 @@ +Package: argeo-tp-equinox +Version: 2.3.4 +Architecture: all +Maintainer: Mathieu Baudier +Description: Eclipse Equinox OSGi runtime diff --git a/sdk/deb/argeo-tp-jcr.control b/sdk/deb/argeo-tp-jcr.control new file mode 100644 index 000000000..a9b0c5631 --- /dev/null +++ b/sdk/deb/argeo-tp-jcr.control @@ -0,0 +1,5 @@ +Package: argeo-tp-jcr +Version: 2.3.4 +Architecture: all +Maintainer: Mathieu Baudier +Description: Java Content Repository API (NON FREE!!) and Apache Jackrabbit diff --git a/sdk/deb/argeo-tp-jetty.control b/sdk/deb/argeo-tp-jetty.control new file mode 100644 index 000000000..cec1432e5 --- /dev/null +++ b/sdk/deb/argeo-tp-jetty.control @@ -0,0 +1,5 @@ +Package: argeo-tp-jetty +Version: 2.3.4 +Architecture: all +Maintainer: Mathieu Baudier +Description: Jetty HTTP server diff --git a/sdk/deb/argeo-tp-rap.control b/sdk/deb/argeo-tp-rap.control new file mode 100644 index 000000000..e2749dd4f --- /dev/null +++ b/sdk/deb/argeo-tp-rap.control @@ -0,0 +1,5 @@ +Package: argeo-tp-rap +Version: 2.3.4 +Architecture: all +Maintainer: Mathieu Baudier +Description: Eclipse RAP diff --git a/sdk/deb/argeo-tp-sdk.control b/sdk/deb/argeo-tp-sdk.control new file mode 100644 index 000000000..05a9066bc --- /dev/null +++ b/sdk/deb/argeo-tp-sdk.control @@ -0,0 +1,5 @@ +Package: argeo-tp-sdk +Version: 2.3.4 +Architecture: all +Maintainer: Mathieu Baudier +Description: Libraries required by the build and test tools diff --git a/sdk/includes.mk b/sdk/includes.mk index e69de29bb..d7cc8d848 100644 --- a/sdk/includes.mk +++ b/sdk/includes.mk @@ -0,0 +1 @@ +include $(SDK_SRC_BASE)/sdk/deb.mk diff --git a/sdk/output-argeo-tp-rap.target b/sdk/output-argeo-tp-rap.target new file mode 100644 index 000000000..c7ec4c919 --- /dev/null +++ b/sdk/output-argeo-tp-rap.target @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/tp/Make.java b/tp/Make.java new file mode 100644 index 000000000..8f1b6af21 --- /dev/null +++ b/tp/Make.java @@ -0,0 +1,32 @@ +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.argeo.slc.factory.A2Factory; + +class Make { + public static void main(String[] args) { + Path originBase = Paths.get("./output/origin").toAbsolutePath().normalize(); + Path factoryBase = Paths.get("./output/a2").toAbsolutePath().normalize(); + A2Factory factory = new A2Factory(originBase, factoryBase); + + 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/slf4j")); +// System.exit(0); + + // Eclipse + factory.processEclipseArchive( + descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox")); + factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap")); + factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp")); + + // Maven + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jcr")); + } + +} \ No newline at end of file -- 2.39.2