From 2e79e2fc6f6fee093f09461dd8925d17a45455f6 Mon Sep 17 00:00:00 2001
From: Anca Luca <lucaa@xwiki.com>
Date: Fri, 13 Jul 2018 17:12:36 +0200
Subject: [PATCH] #141: Create a publication application in Java based on the
 existing Velocity application * Moved the publication application on the root
 of the code hierarchy, in view of having it moved out as an independent
 extension * Also changed its version to 1.0-SNAPSHOT * Moved the scheduler
 job, that is specific to wikidemarches, to the wikidemat wiki build instead
 if the generic publication application * Removed the old publication
 application from the build of the wikidemat, as it's not used anymore ** Left
 the code in the repo, but the code should be removed as well, as it was
 replaced by the new application

---
 .../application-publication-api/pom.xml       |  2 +-
 .../publication/AbstractPublicationJob.java   |  0
 .../publication/PublicationConfiguration.java |  0
 .../publication/internal/PublicationJob.java  |  0
 .../src/main/resources/META-INF/MANIFEST.MF   |  0
 .../main/resources/META-INF/components.txt    |  0
 .../pom.xml                                   | 14 +++---
 .../application-publication-ui/pom.xml        | 47 -------------------
 applications/pom.xml                          |  1 -
 pom.xml                                       |  1 +
 wikis/wikidemat/pom.xml                       |  8 ++--
 .../resources/Publication/Code/Scheduler.xml  |  0
 12 files changed, 13 insertions(+), 60 deletions(-)
 rename {applications/application-publication => application-publication}/application-publication-api/pom.xml (98%)
 rename {applications/application-publication => application-publication}/application-publication-api/src/main/java/org/xwiki/contrib/publication/AbstractPublicationJob.java (100%)
 rename {applications/application-publication => application-publication}/application-publication-api/src/main/java/org/xwiki/contrib/publication/PublicationConfiguration.java (100%)
 rename {applications/application-publication => application-publication}/application-publication-api/src/main/java/org/xwiki/contrib/publication/internal/PublicationJob.java (100%)
 rename {applications/application-publication => application-publication}/application-publication-api/src/main/resources/META-INF/MANIFEST.MF (100%)
 rename {applications/application-publication => application-publication}/application-publication-api/src/main/resources/META-INF/components.txt (100%)
 rename {applications/application-publication => application-publication}/pom.xml (83%)
 delete mode 100644 applications/application-publication/application-publication-ui/pom.xml
 rename {applications/application-publication/application-publication-ui => wikis/wikidemat}/src/main/resources/Publication/Code/Scheduler.xml (100%)

diff --git a/applications/application-publication/application-publication-api/pom.xml b/application-publication/application-publication-api/pom.xml
similarity index 98%
rename from applications/application-publication/application-publication-api/pom.xml
rename to application-publication/application-publication-api/pom.xml
index f6efdbe8..7586c999 100644
--- a/applications/application-publication/application-publication-api/pom.xml
+++ b/application-publication/application-publication-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.contrib</groupId>
     <artifactId>application-publication</artifactId>
-    <version>1.0</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>application-publication-api</artifactId>
   <name>Publication Application API</name>
diff --git a/applications/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/AbstractPublicationJob.java b/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/AbstractPublicationJob.java
similarity index 100%
rename from applications/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/AbstractPublicationJob.java
rename to application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/AbstractPublicationJob.java
diff --git a/applications/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/PublicationConfiguration.java b/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/PublicationConfiguration.java
similarity index 100%
rename from applications/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/PublicationConfiguration.java
rename to application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/PublicationConfiguration.java
diff --git a/applications/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/internal/PublicationJob.java b/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/internal/PublicationJob.java
similarity index 100%
rename from applications/application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/internal/PublicationJob.java
rename to application-publication/application-publication-api/src/main/java/org/xwiki/contrib/publication/internal/PublicationJob.java
diff --git a/applications/application-publication/application-publication-api/src/main/resources/META-INF/MANIFEST.MF b/application-publication/application-publication-api/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from applications/application-publication/application-publication-api/src/main/resources/META-INF/MANIFEST.MF
rename to application-publication/application-publication-api/src/main/resources/META-INF/MANIFEST.MF
diff --git a/applications/application-publication/application-publication-api/src/main/resources/META-INF/components.txt b/application-publication/application-publication-api/src/main/resources/META-INF/components.txt
similarity index 100%
rename from applications/application-publication/application-publication-api/src/main/resources/META-INF/components.txt
rename to application-publication/application-publication-api/src/main/resources/META-INF/components.txt
diff --git a/applications/application-publication/pom.xml b/application-publication/pom.xml
similarity index 83%
rename from applications/application-publication/pom.xml
rename to application-publication/pom.xml
index 07a91258..a10bbb71 100644
--- a/applications/application-publication/pom.xml
+++ b/application-publication/pom.xml
@@ -31,18 +31,21 @@
   <artifactId>application-publication</artifactId>
   <name>Publication Application parent POM</name>
   <packaging>pom</packaging>
-  <version>1.0</version>
+  <version>1.0-SNAPSHOT</version>
   <developers>
     <developer>
       <id>slauriere</id>
       <name>Stéphane Laurière</name>
     </developer>
+    <developer>
+      <id>lucaa</id>
+      <name>Anca Luca</name>
+    </developer>
   </developers>
   <scm>
-    <connection>scm:git:git://github.com/xwiki-contrib/application-publication.git</connection>
-    <developerConnection>scm:git:git@github.com:xwiki-contrib/application-publication.git</developerConnection>
-    <url>https://github.com/xwiki-contrib/application-publication.git</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:git://github.com/DISIC/wikidemarches.git</connection>
+    <developerConnection>scm:git:git@github.com:DISIC/wikidemarches.git</developerConnection>
+    <url>https://github.com/DISIC/wikidemarches/tree/master</url>
   </scm>
   <distributionManagement>
     <repository>
@@ -53,6 +56,5 @@
   </distributionManagement>
   <modules>
     <module>application-publication-api</module>
-    <module>application-publication-ui</module>
   </modules>
 </project>
diff --git a/applications/application-publication/application-publication-ui/pom.xml b/applications/application-publication/application-publication-ui/pom.xml
deleted file mode 100644
index 1cfeb3cd..00000000
--- a/applications/application-publication/application-publication-ui/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * 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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-          <groupId>org.xwiki.contrib</groupId>
-	  <artifactId>application-publication</artifactId>
-	  <version>1.0</version>
-	</parent>
-	<artifactId>application-publication-ui</artifactId>
-	<name>Publication Application</name>
-	<packaging>xar</packaging>
-	<description>Create publication configurations and run publication jobs</description>
-	<properties>
-		<xwiki.extension.name>Publication Application</xwiki.extension.name>
-		<xwiki.extension.category>application</xwiki.extension.category>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.xwiki.contrib</groupId>
-			<artifactId>application-publication-api</artifactId>
-			<version>${project.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/applications/pom.xml b/applications/pom.xml
index e6f3d3c1..4fd063e1 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -35,7 +35,6 @@
   <modules>
     <module>demarches</module>
     <module>publication</module>
-    <module>application-publication</module>
   </modules>
   <build>
     <extensions>
diff --git a/pom.xml b/pom.xml
index 2d7b0e13..82d35057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,5 +50,6 @@
   <modules>
     <module>applications</module>
     <module>wikis</module>
+    <module>application-publication</module>
   </modules>
 </project>
diff --git a/wikis/wikidemat/pom.xml b/wikis/wikidemat/pom.xml
index ea78c22c..7c3fb150 100644
--- a/wikis/wikidemat/pom.xml
+++ b/wikis/wikidemat/pom.xml
@@ -41,11 +41,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.xwiki.projects.dinsic.wikidemarches</groupId>
-      <artifactId>xwiki-dinsic-wikidemarches-applications-publication</artifactId>
-      <version>${project.version}</version>
-      <type>xar</type>
-      <scope>provided</scope>
+      <groupId>org.xwiki.contrib</groupId>
+      <artifactId>application-publication-api</artifactId>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/applications/application-publication/application-publication-ui/src/main/resources/Publication/Code/Scheduler.xml b/wikis/wikidemat/src/main/resources/Publication/Code/Scheduler.xml
similarity index 100%
rename from applications/application-publication/application-publication-ui/src/main/resources/Publication/Code/Scheduler.xml
rename to wikis/wikidemat/src/main/resources/Publication/Code/Scheduler.xml