From fa49f28266178719857f5bd8772078c1b4e239f8 Mon Sep 17 00:00:00 2001 From: Simon Urli Date: Mon, 24 Jul 2023 18:18:49 +0200 Subject: [PATCH] [Misc] Moving deprecated Job APIs to legacy --- .../internal/ExtensionJobHistoryRecorder.java | 2 +- .../xwiki-commons-job-api/pom.xml | 2 + .../xwiki-commons-job-default/pom.xml | 2 + .../job/internal/DefaultJobStatusStore.java | 2 +- .../main/resources/META-INF/components.txt | 2 - .../status/id1/id2/id3/&status/status.xml | 4 +- .../resources/jobs/status/id1/id2/status.xml | 4 +- .../status/id1/invalidlogargument/status.xml | 4 +- .../src/test/resources/jobs/status/status.xml | 4 +- .../xwiki-commons-legacy/pom.xml | 2 + .../xwiki-commons-legacy-extension/pom.xml | 37 +++++++++++ .../pom.xml | 51 +++++++++++++++ .../LegacyExtensionJobHistoryRecorder.java | 65 +++++++++++++++++++ .../main/resources/META-INF/components.txt | 1 + .../xwiki-commons-legacy-job/pom.xml | 38 +++++++++++ .../xwiki-commons-legacy-job-api/pom.xml | 46 +++++++++++++ .../main/java/org/xwiki/job/JobManager.java | 0 .../xwiki/job/internal/AbstractJobStatus.java | 0 .../xwiki-commons-legacy-job-default/pom.xml | 58 +++++++++++++++++ .../org/xwiki/job/internal/AbstractJob.java | 0 .../xwiki/job/internal/DefaultJobManager.java | 0 .../xwiki/job/internal/DefaultJobStatus.java | 0 .../job/internal/DefaultJobStatusStorage.java | 2 +- .../xwiki/job/internal/JobStatusStorage.java | 0 .../main/resources/META-INF/components.txt | 2 + .../job/internal/DefaultJobManagerTest.java | 0 26 files changed, 315 insertions(+), 13 deletions(-) create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/pom.xml create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/pom.xml create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/java/org/xwiki/extension/job/history/internal/LegacyExtensionJobHistoryRecorder.java create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/resources/META-INF/components.txt create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/pom.xml create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/pom.xml rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-api => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api}/src/main/java/org/xwiki/job/JobManager.java (100%) rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-api => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api}/src/main/java/org/xwiki/job/internal/AbstractJobStatus.java (100%) create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/pom.xml rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-default => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default}/src/main/java/org/xwiki/job/internal/AbstractJob.java (100%) rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-default => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default}/src/main/java/org/xwiki/job/internal/DefaultJobManager.java (100%) rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-default => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default}/src/main/java/org/xwiki/job/internal/DefaultJobStatus.java (100%) rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-default => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default}/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java (96%) rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-default => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default}/src/main/java/org/xwiki/job/internal/JobStatusStorage.java (100%) create mode 100644 xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/resources/META-INF/components.txt rename xwiki-commons-core/{xwiki-commons-job/xwiki-commons-job-default => xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default}/src/test/java/org/xwiki/job/internal/DefaultJobManagerTest.java (100%) diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/job/history/internal/ExtensionJobHistoryRecorder.java b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/job/history/internal/ExtensionJobHistoryRecorder.java index c3e46b2be5..1832ecf888 100644 --- a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/job/history/internal/ExtensionJobHistoryRecorder.java +++ b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/job/history/internal/ExtensionJobHistoryRecorder.java @@ -46,7 +46,7 @@ import org.xwiki.job.event.JobStartedEvent; import org.xwiki.job.event.status.JobStatus; import org.xwiki.job.event.status.QuestionAnsweredEvent; -import org.xwiki.job.internal.AbstractJobStatus; +import org.xwiki.job.AbstractJobStatus; import org.xwiki.observation.AbstractEventListener; import org.xwiki.observation.event.Event; diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/pom.xml b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/pom.xml index e4af3dd8aa..52d85a68e9 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/pom.xml +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/pom.xml @@ -33,6 +33,8 @@ XWiki Commons - Job - API 0.14 + + true diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/pom.xml b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/pom.xml index 806fc6596a..1a92f3698f 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/pom.xml +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/pom.xml @@ -37,6 +37,8 @@ org.xwiki.commons:xwiki-commons-job 0.62 + + true diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStore.java b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStore.java index eac07b9cfa..ad8929fb44 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStore.java +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStore.java @@ -59,7 +59,7 @@ import org.xwiki.logging.tail.LoggerTail; /** - * Default implementation of {@link JobStatusStorage}. + * Default implementation of {@link JobStatusStore}. * * @version $Id$ * @since 6.1M2 diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/resources/META-INF/components.txt b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/resources/META-INF/components.txt index 6672884e24..5ddec84d37 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/resources/META-INF/components.txt +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/resources/META-INF/components.txt @@ -1,9 +1,7 @@ org.xwiki.job.internal.DefaultJobContext org.xwiki.job.internal.DefaultJobExecutor -org.xwiki.job.internal.DefaultJobManager org.xwiki.job.internal.DefaultJobManagerConfiguration org.xwiki.job.internal.DefaultJobProgressManager -org.xwiki.job.internal.DefaultJobStatusStorage org.xwiki.job.internal.DefaultJobStatusStore org.xwiki.job.internal.JobStatusSerializer org.xwiki.job.internal.script.safe.JobStatusScriptSafeProvider diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/id3/&status/status.xml b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/id3/&status/status.xml index 19fbf0ad78..1ba2dee8fd 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/id3/&status/status.xml +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/id3/&status/status.xml @@ -19,7 +19,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + FINISHED @@ -62,4 +62,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/status.xml b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/status.xml index 3aae51ff1c..37ac8effd2 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/status.xml +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/id2/status.xml @@ -19,7 +19,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + FINISHED @@ -61,4 +61,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/invalidlogargument/status.xml b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/invalidlogargument/status.xml index f893b6f20d..18548479bf 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/invalidlogargument/status.xml +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/id1/invalidlogargument/status.xml @@ -19,7 +19,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + FINISHED @@ -57,4 +57,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/status.xml b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/status.xml index 2e58490cb9..599a6088a6 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/status.xml +++ b/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/resources/jobs/status/status.xml @@ -19,7 +19,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + FINISHED @@ -57,4 +57,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/xwiki-commons-core/xwiki-commons-legacy/pom.xml b/xwiki-commons-core/xwiki-commons-legacy/pom.xml index 3df1bf0518..f4b136541f 100644 --- a/xwiki-commons-core/xwiki-commons-legacy/pom.xml +++ b/xwiki-commons-core/xwiki-commons-legacy/pom.xml @@ -39,6 +39,8 @@ xwiki-commons-legacy-classloader xwiki-commons-legacy-component xwiki-commons-legacy-configuration + xwiki-commons-legacy-extension + xwiki-commons-legacy-job xwiki-commons-legacy-properties xwiki-commons-legacy-velocity xwiki-commons-legacy-velocity-tools diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/pom.xml b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/pom.xml new file mode 100644 index 0000000000..309399a529 --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/pom.xml @@ -0,0 +1,37 @@ + + + + + + 4.0.0 + + org.xwiki.commons + xwiki-commons-legacy + 15.7-SNAPSHOT + + xwiki-commons-legacy-extension + XWiki Commons - Legacy - Extension - Parent POM + pom + Legacy modules for xwiki-commons-extension-* + + xwiki-commons-legacy-extension-api + + diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/pom.xml b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/pom.xml new file mode 100644 index 0000000000..76dbf9c248 --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/pom.xml @@ -0,0 +1,51 @@ + + + + + + 4.0.0 + + org.xwiki.commons + xwiki-commons-legacy-extension + 15.7-SNAPSHOT + + xwiki-commons-legacy-extension-api + XWiki Commons - Legacy - Extension - API + jar + Legacy module for xwiki-commons-extension-api + + 0.00 + + org.xwiki.commons:xwiki-commons-extension-api + + + + org.xwiki.commons + xwiki-commons-extension-api + ${project.version} + + + org.xwiki.commons + xwiki-commons-legacy-job-api + ${project.version} + + + diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/java/org/xwiki/extension/job/history/internal/LegacyExtensionJobHistoryRecorder.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/java/org/xwiki/extension/job/history/internal/LegacyExtensionJobHistoryRecorder.java new file mode 100644 index 0000000000..8a78876d15 --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/java/org/xwiki/extension/job/history/internal/LegacyExtensionJobHistoryRecorder.java @@ -0,0 +1,65 @@ +/* + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.xwiki.extension.job.history.internal; + +import javax.inject.Named; +import javax.inject.Singleton; + +import org.xwiki.component.annotation.Component; +import org.xwiki.extension.job.history.ReplayJobStatus; +import org.xwiki.job.Job; +import org.xwiki.job.event.JobStartedEvent; +import org.xwiki.job.internal.AbstractJobStatus; +import org.xwiki.observation.event.Event; + +/** + * Legacy implementation of {@link ExtensionJobHistoryRecorder}. + * + * @version $Id$ + * @since 15.7RC1 + */ +@Component +@Named(ExtensionJobHistoryRecorder.NAME) +@Singleton +@Deprecated +public class LegacyExtensionJobHistoryRecorder extends ExtensionJobHistoryRecorder +{ + @Override + public void onEvent(Event event, Object source, Object data) + { + boolean ignore = false; + if (event instanceof JobStartedEvent) { + Job job = (Job) source; + if (job.getStatus() instanceof org.xwiki.job.AbstractJobStatus + && isSubJob((AbstractJobStatus) job.getStatus())) { + // We record only the jobs that have been triggered explicitly or that are part of a replay. + ignore = true; + } + } + if (!ignore) { + super.onEvent(event, source, data); + } + } + + private > boolean isSubJob(T jobStatus) + { + return jobStatus.isSubJob() && !(jobStatus.getParentJobStatus() instanceof ReplayJobStatus); + } +} diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/resources/META-INF/components.txt b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/resources/META-INF/components.txt new file mode 100644 index 0000000000..a1778b92f1 --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-extension/xwiki-commons-legacy-extension-api/src/main/resources/META-INF/components.txt @@ -0,0 +1 @@ +500:org.xwiki.extension.job.history.internal.LegacyExtensionJobHistoryRecorder diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/pom.xml b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/pom.xml new file mode 100644 index 0000000000..707802e8a0 --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/pom.xml @@ -0,0 +1,38 @@ + + + + + + 4.0.0 + + org.xwiki.commons + xwiki-commons-legacy + 15.7-SNAPSHOT + + xwiki-commons-legacy-job + XWiki Commons - Legacy - Job - Parent POM + pom + Legacy modules for xwiki-commons-job-* + + xwiki-commons-legacy-job-api + xwiki-commons-legacy-job-default + + diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/pom.xml b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/pom.xml new file mode 100644 index 0000000000..f6c19857c3 --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/pom.xml @@ -0,0 +1,46 @@ + + + + + + 4.0.0 + + org.xwiki.commons + xwiki-commons-legacy-job + 15.7-SNAPSHOT + + xwiki-commons-legacy-job-api + XWiki Commons - Legacy - Job - API + jar + Legacy module for xwiki-commons-job-api + + 0.00 + + org.xwiki.commons:xwiki-commons-job-api + + + + org.xwiki.commons + xwiki-commons-job-api + ${project.version} + + + diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/src/main/java/org/xwiki/job/JobManager.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/src/main/java/org/xwiki/job/JobManager.java similarity index 100% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/src/main/java/org/xwiki/job/JobManager.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/src/main/java/org/xwiki/job/JobManager.java diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/src/main/java/org/xwiki/job/internal/AbstractJobStatus.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/src/main/java/org/xwiki/job/internal/AbstractJobStatus.java similarity index 100% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-api/src/main/java/org/xwiki/job/internal/AbstractJobStatus.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-api/src/main/java/org/xwiki/job/internal/AbstractJobStatus.java diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/pom.xml b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/pom.xml new file mode 100644 index 0000000000..99d5ff75cb --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/pom.xml @@ -0,0 +1,58 @@ + + + + + + 4.0.0 + + org.xwiki.commons + xwiki-commons-legacy-job + 15.7-SNAPSHOT + + xwiki-commons-legacy-job-default + XWiki Commons - Legacy - Job - API + jar + Legacy module for xwiki-commons-job-default + + 0.19 + + org.xwiki.commons:xwiki-commons-job-default + + + + org.xwiki.commons + xwiki-commons-job-default + ${project.version} + + + org.xwiki.commons + xwiki-commons-legacy-job-api + ${project.version} + + + + org.xwiki.commons + xwiki-commons-tool-test-component + ${project.version} + test + + + diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/AbstractJob.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/AbstractJob.java similarity index 100% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/AbstractJob.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/AbstractJob.java diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobManager.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/DefaultJobManager.java similarity index 100% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobManager.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/DefaultJobManager.java diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatus.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatus.java similarity index 100% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatus.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatus.java diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java similarity index 96% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java index 1ddec4c7a2..46b0e83187 100644 --- a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/DefaultJobStatusStorage.java @@ -34,7 +34,7 @@ * * @version $Id$ * @since 4.0M1 - * @deprecated since 6.1M2, use {@link org.xwiki.job.internal.DefaultJobStatusStore} instead + * @deprecated since 6.1M2, use {@link DefaultJobStatusStore} instead */ @Component @Singleton diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/JobStatusStorage.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/JobStatusStorage.java similarity index 100% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/main/java/org/xwiki/job/internal/JobStatusStorage.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/java/org/xwiki/job/internal/JobStatusStorage.java diff --git a/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/resources/META-INF/components.txt b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/resources/META-INF/components.txt new file mode 100644 index 0000000000..091f51b282 --- /dev/null +++ b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/main/resources/META-INF/components.txt @@ -0,0 +1,2 @@ +org.xwiki.job.internal.DefaultJobManager +org.xwiki.job.internal.DefaultJobStatusStorage diff --git a/xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/java/org/xwiki/job/internal/DefaultJobManagerTest.java b/xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/test/java/org/xwiki/job/internal/DefaultJobManagerTest.java similarity index 100% rename from xwiki-commons-core/xwiki-commons-job/xwiki-commons-job-default/src/test/java/org/xwiki/job/internal/DefaultJobManagerTest.java rename to xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-job/xwiki-commons-legacy-job-default/src/test/java/org/xwiki/job/internal/DefaultJobManagerTest.java