From 079a8c05c1c9b1a18858f431777a705b243ec89d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 19 Oct 2022 08:55:30 +0200 Subject: [PATCH] Clarify legacy and remove old folders --- bin/.gitignore | 1 - bin/argeo-builder | 49 ------------------- bin/argeo-tp-factory.properties | 25 ---------- bin/log4j.properties | 39 --------------- demo/.gitignore | 2 - demo/all.policy | 3 -- demo/log4j.properties | 12 ----- demo/slc_localrepo.properties | 49 ------------------- {specs => legacy}/bootstrap/ant/build.sh | 0 .../ant/org.apache.ant-skipTestJars.patch | 0 .../org.argeo.tp/biz.aQute.bnd/build.sh | 0 .../MANIFEST.MF | 0 .../build.sh | 0 13 files changed, 180 deletions(-) delete mode 100644 bin/.gitignore delete mode 100644 bin/argeo-builder delete mode 100644 bin/argeo-tp-factory.properties delete mode 100644 bin/log4j.properties delete mode 100644 demo/.gitignore delete mode 100644 demo/all.policy delete mode 100644 demo/log4j.properties delete mode 100644 demo/slc_localrepo.properties rename {specs => legacy}/bootstrap/ant/build.sh (100%) rename {specs => legacy}/bootstrap/ant/org.apache.ant-skipTestJars.patch (100%) rename {specs => legacy}/org.argeo.tp/biz.aQute.bnd/build.sh (100%) rename {specs => legacy}/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF (100%) rename {specs => legacy}/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh (100%) diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 2db33e9..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/exec diff --git a/bin/argeo-builder b/bin/argeo-builder deleted file mode 100644 index b1ba627..0000000 --- a/bin/argeo-builder +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -if [ -z "$JAVA_HOME" ]; then - export JAVA_HOME=/usr/lib/jvm/java-1.6.0 -fi -JAVA=$JAVA_HOME/bin/java - -function argeo_builder_variables() { - export ARTIFACT_DIR=$1 - export ARTIFACT=${ARTIFACT_DIR##*/} - export GROUP_DIR=$(dirname "$ARTIFACT_DIR") - export GROUP=${GROUP_DIR##*/} - export SOURCE_DIR=${ARTIFACT_DIR/specs/sources} - export BUILD_DIR=${ARTIFACT_DIR/specs/build} - export ROOT_DIR=`cd $ARTIFACT_DIR/../../.. && pwd` - export CACHE_BASE=$ROOT_DIR/cache - CACHE_DIR=${GROUP_DIR/specs/cache} -} - -function argeo_builder_download_eclipse() { - MIRROR=http://ftp.halifax.rwth-aachen.de/eclipse - FILE=$1 - URL=$MIRROR$FILE - mkdir -p $SOURCE_DIR - (cd $SOURCE_DIR && wget --timestamping $URL) -} - -function argeo_builder_download_apache() { - MIRROR=http://apache.openmirror.de - FILE=$1 - URL=$MIRROR$FILE - mkdir -p $SOURCE_DIR - (cd $SOURCE_DIR && wget --timestamping $URL) -} - -function run_ant() { - $JAVA -jar $CACHE_BASE/bootstrap/ant-launcher.jar $1 -} - -function push_to_cache() { - mkdir -p $CACHE_DIR - cp -v $1 $CACHE_DIR -} - -function reset_dir() { - rm -rf $1 - mkdir -p $1 -} - diff --git a/bin/argeo-tp-factory.properties b/bin/argeo-tp-factory.properties deleted file mode 100644 index 80660dd..0000000 --- a/bin/argeo-tp-factory.properties +++ /dev/null @@ -1,25 +0,0 @@ -argeo.osgi.start=\ -org.springframework.osgi.extender,\ -org.argeo.node.repo.jackrabbit,\ -org.argeo.security.dao.os,\ -org.argeo.slc.node.jackrabbit,\ -org.argeo.slc.agent,\ -org.argeo.slc.agent.jcr,\ -org.argeo.slc.support.maven,\ -org.argeo.slc.server.repo,\ - -argeo.osgi.start.5=org.argeo.server.catalina.start,\ -org.springframework.osgi.web.extender,\ -org.argeo.jackrabbit.webapp,\ -org.argeo.slc.server.repo.webapp,\ - -slc.executionModules=org.argeo.tp.factory.core,\ - -eclipse.application=org.argeo.slc.client.rcp.application -org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective - -log4j.configuration=file:../../log4j.properties - -#argeo.server.tomcat.config=conf/default-server-ssl.xml - -argeo.server.port.http=7080 diff --git a/bin/log4j.properties b/bin/log4j.properties deleted file mode 100644 index aab447b..0000000 --- a/bin/log4j.properties +++ /dev/null @@ -1,39 +0,0 @@ -#log4j.rootLogger=WARN, console -log4j.rootLogger=WARN, development - -## Levels -log4j.logger.org.argeo=DEBUG -log4j.logger.org.argeo.slc.repo=DEBUG -log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR -log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR -log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN - -#log4j.logger.org.apache=DEBUG -#log4j.logger.org.springframework.security=DEBUG -#log4j.logger.org.apache.jackrabbit=DEBUG -#log4j.logger.org.apache.jackrabbit.spi2dav=DEBUG -#log4j.logger.org.apache.jackrabbit.core.query.QueryImpl=DEBUG - -log4j.logger.org.apache.coyote=INFO -log4j.logger.org.apache.catalina.core.ContainerBase=INFO -log4j.logger.org.apache.directory.server=ERROR -log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR -log4j.logger.org.apache.jackrabbit.core.config.ConfigurationErrorHandler=ERROR -log4j.logger.org.apache.jackrabbit.core.util.db.DbUtility=FATAL - -## Appenders -# default appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [%t] %c%n - -# messages only appender -log4j.appender.messages=org.apache.log4j.ConsoleAppender -log4j.appender.messages.layout=org.apache.log4j.PatternLayout -log4j.appender.messages.layout.ConversionPattern=%m%n - -# development appender -log4j.appender.development=org.apache.log4j.ConsoleAppender -log4j.appender.development.layout=org.apache.log4j.PatternLayout -log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%16.16t] %5p %m (%F:%L) %c%n -#log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p %m [%16.16t] %c%n diff --git a/demo/.gitignore b/demo/.gitignore deleted file mode 100644 index 0980598..0000000 --- a/demo/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/exec/ -/target/ diff --git a/demo/all.policy b/demo/all.policy deleted file mode 100644 index facb613..0000000 --- a/demo/all.policy +++ /dev/null @@ -1,3 +0,0 @@ -grant { - permission java.security.AllPermission; -}; \ No newline at end of file diff --git a/demo/log4j.properties b/demo/log4j.properties deleted file mode 100644 index 122f42a..0000000 --- a/demo/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=WARN, development - -log4j.logger.org.argeo=DEBUG - -## Appenders -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n - -log4j.appender.development=org.apache.log4j.ConsoleAppender -log4j.appender.development.layout=org.apache.log4j.PatternLayout -log4j.appender.development.layout.ConversionPattern=%d{ABSOLUTE} %m (%F:%L) [%t] %p %n diff --git a/demo/slc_localrepo.properties b/demo/slc_localrepo.properties deleted file mode 100644 index c86407f..0000000 --- a/demo/slc_localrepo.properties +++ /dev/null @@ -1,49 +0,0 @@ -argeo.osgi.start.2.http=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.cm,\ -org.eclipse.rap.rwt.osgi,\ -org.argeo.init - - -argeo.osgi.start.3.node=\ -org.argeo.cms,\ -org.argeo.cms.jcr - -argeo.osgi.start.4.apps=\ -org.eclipse.gemini.blueprint.extender - -argeo.osgi.start.4.workbench=\ -org.eclipse.equinox.http.registry,\ - -argeo.osgi.start.5.slc=\ -org.argeo.slc.agent,\ -org.argeo.slc.agent.jcr,\ -org.argeo.slc.server.repo,\ - -slc.executionModules=org.argeo.tp.factory.core,\ -org.argeo.tp.factory.extras,\ -org.argeo.tp.factory.rcp - -argeo.node.repo.type=h2 -#argeo.node.useradmin.uris=ipa:/// - -log.org.argeo=DEBUG - -#org.osgi.framework.security=osgi -java.security.manager= -java.security.policy=file:../../all.policy - -org.osgi.service.http.port=7080 -org.eclipse.equinox.http.jetty.log.stderr.threshold=info - -log4j.configuration=file:../../log4j.properties -org.eclipse.rap.workbenchAutostart=false - -# DON'T CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING -eclipse.ignoreApp=true -osgi.noShutdown=true -org.eclipse.equinox.http.jetty.autostart=false -org.eclipse.rap.workbenchAutostart=false - -# Avoid errors logs (see https://issues.apache.org/jira/browse/JCR-2226) -org.apache.jackrabbit.core.statementcache=false \ No newline at end of file diff --git a/specs/bootstrap/ant/build.sh b/legacy/bootstrap/ant/build.sh similarity index 100% rename from specs/bootstrap/ant/build.sh rename to legacy/bootstrap/ant/build.sh diff --git a/specs/bootstrap/ant/org.apache.ant-skipTestJars.patch b/legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch similarity index 100% rename from specs/bootstrap/ant/org.apache.ant-skipTestJars.patch rename to legacy/bootstrap/ant/org.apache.ant-skipTestJars.patch diff --git a/specs/org.argeo.tp/biz.aQute.bnd/build.sh b/legacy/org.argeo.tp/biz.aQute.bnd/build.sh similarity index 100% rename from specs/org.argeo.tp/biz.aQute.bnd/build.sh rename to legacy/org.argeo.tp/biz.aQute.bnd/build.sh diff --git a/specs/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF b/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF similarity index 100% rename from specs/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF rename to legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/MANIFEST.MF diff --git a/specs/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh b/legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh similarity index 100% rename from specs/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh rename to legacy/org.argeo.tp/org.eclipse.jdt.core.compiler.batch/build.sh -- 2.30.2