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 @@
org.xwiki.contrib
application-publication
- 1.0
+ 1.0-SNAPSHOT
application-publication-api
Publication Application API
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 @@
application-publication
Publication Application parent POM
pom
- 1.0
+ 1.0-SNAPSHOT
slauriere
Stéphane Laurière
+
+ lucaa
+ Anca Luca
+
- scm:git:git://github.com/xwiki-contrib/application-publication.git
- scm:git:git@github.com:xwiki-contrib/application-publication.git
- https://github.com/xwiki-contrib/application-publication.git
- HEAD
+ scm:git:git://github.com/DISIC/wikidemarches.git
+ scm:git:git@github.com:DISIC/wikidemarches.git
+ https://github.com/DISIC/wikidemarches/tree/master
@@ -53,6 +56,5 @@
application-publication-api
- application-publication-ui
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 @@
-
-
-
-
-
-
- 4.0.0
-
- org.xwiki.contrib
- application-publication
- 1.0
-
- application-publication-ui
- Publication Application
- xar
- Create publication configurations and run publication jobs
-
- Publication Application
- application
-
-
-
- org.xwiki.contrib
- application-publication-api
- ${project.version}
- runtime
-
-
-
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 @@
demarches
publication
- application-publication
diff --git a/pom.xml b/pom.xml
index 2d7b0e13..82d35057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,5 +50,6 @@
applications
wikis
+ application-publication
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 @@
provided
- com.xwiki.projects.dinsic.wikidemarches
- xwiki-dinsic-wikidemarches-applications-publication
- ${project.version}
- xar
- provided
+ org.xwiki.contrib
+ application-publication-api
+ 1.0-SNAPSHOT
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