Integrate CMS in Commons

git-svn-id: https://svn.argeo.org/commons/trunk@7509 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.dep.cms/pom.xml b/dep/org.argeo.dep.cms/pom.xml
index 9c4caad846e639ea299061712b25f4a8b7a057c9..eb344cb4be08882d81cd11eefc5a0b985d37bfd6 100644 (file)
--- a/dep/org.argeo.dep.cms/pom.xml
+++ b/dep/org.argeo.dep.cms/pom.xml
@@ -2,33 +2,33 @@
 <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.argeo.connect</groupId>
-               <version>2.1.13-SNAPSHOT</version>
+               <groupId>org.argeo.commons</groupId>
+               <version>2.1.12-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
-       <artifactId>org.argeo.connect.dep.node.web</artifactId>
-       <name>Connect Node Web Dependencies</name>
+       <artifactId>org.argeo.dep.cms</artifactId>
+       <name>CMS Dependencies</name>
        <dependencies>
                <!-- Connect -->
                <dependency>
-                       <groupId>org.argeo.connect</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
-                       <version>2.1.13-SNAPSHOT</version>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
                <!-- Commons -->
                <dependency>
-                       <groupId>org.argeo.commons.base</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.util</artifactId>
-                       <version>${version.argeo-commons}</version>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
                <!-- Node (without RAP) -->
                <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.security.dep.node</artifactId>
-                       <version>${version.argeo-commons}</version>
+                       <version>2.1.12-SNAPSHOT</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.argeo.tp</groupId>
@@ -43,9 +43,9 @@
 
                <!-- Minimal web target platform -->
                <dependency>
-                       <groupId>org.argeo.commons.base</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
-                       <version>${version.argeo-commons}</version>
+                       <version>2.1.12-SNAPSHOT</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>
@@ -76,19 +76,6 @@
                                        <groupId>org.argeo.tp.rap.platform</groupId>
                                        <artifactId>org.eclipse.rap.ui.views</artifactId>
                                </exclusion>
-                               <!-- Example, demos -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.demo.controls</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.example</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.example.pages</artifactId>
-                               </exclusion>
                        </exclusions>
                </dependency>
        </dependencies>

diff --git a/dep/org.argeo.eclipse.dep.rap/pom.xml b/dep/org.argeo.eclipse.dep.rap/pom.xml
index 05675e2100633cd5d06ca263a1f52ba0ae8e4871..99cd076f20aceb267e3366a6f96a4ee89985fa3b 100644 (file)
--- a/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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.argeo.commons</groupId>
@@ -18,11 +19,6 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp</groupId> -->
-               <!-- <artifactId>org.eclipse.osgi</artifactId> -->
-               <!-- </dependency> -->
-
                <dependency>
                        <groupId>org.argeo.tp.rap.addons</groupId>
                        <artifactId>binaries</artifactId>
@@ -43,54 +39,6 @@
                        <version>${version.rap}</version>
                        <type>pom</type>
                        <exclusions>
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>javax.servlet</artifactId> -->
-                               <!-- </exclusion> -->
-
-                               <!-- Jetty -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.equinox.http.jetty</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.mortbay.jetty.server</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.mortbay.jetty.util</artifactId> -->
-                               <!-- </exclusion> -->
-
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.jetty.security</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.jetty.http</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.jetty.server</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.jetty.continuation</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.jetty.util</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.jetty.io</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.jetty.servlet</artifactId> -->
-                               <!-- </exclusion> -->
-
                                <!-- Demo -->
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>
@@ -105,6 +53,20 @@
                                        <artifactId>org.eclipse.rap.design.example</artifactId>
                                </exclusion>
 
+                               <!-- Example, demos -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.demo.controls</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.example</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.example.pages</artifactId>
+                               </exclusion>
+
                                <!-- Troublesome bundles -->
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>
@@ -121,13 +83,7 @@
                        </exclusions>
                </dependency>
 
-               <!-- Dependency to enable file upload. Should be included directly in coming 
-                       rap distribution -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.tp.rap</groupId> -->
-               <!-- <artifactId>org.eclipse.rwt.widgets.upload</artifactId> -->
-               <!-- </dependency> -->
-               <!-- Needed by the bundle above -->
+               <!-- Needed by upload -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.apache.commons.io</artifactId>
@@ -149,13 +105,6 @@
                        <artifactId>org.eclipse.equinox.security</artifactId>
                </dependency>
 
-               <!-- 2014-07-31 mbaudier : Removed, since it feels wrong to put an Argeo 
-                       dependency here -->
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.commons</groupId> -->
-               <!-- <artifactId>org.argeo.osgi.boot</artifactId> -->
-               <!-- <version>2.1.8-SNAPSHOT</version> -->
-               <!-- </dependency> -->
        </dependencies>
        <profiles>
                <profile>
@@ -223,7 +172,8 @@
                                                                <configuration>
                                                                        <target>
                                                                                <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>

diff --git a/dep/pom.xml b/dep/pom.xml
index be0882915423c3b0afb76cd0a9db4d4f58b84c7a..2c0fccf77423149ed6107cdff1fc9caf44f7c446 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -21,6 +21,7 @@
                <module>org.argeo.security.dep.node.eclipse</module>
                <module>org.argeo.security.dep.node.rap</module>
                <module>org.argeo.security.dep.node.rcp</module>
+               <module>org.argeo.dep.cms</module>
        </modules>
        <build>
                <plugins>

diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index 96ad206b1b2859720b5a27184929ed0bdd4df66f..f2a470882fef893867f4c23e863209b939ddbf34 100644 (file)
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -1,49 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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.argeo.connect</groupId>
-               <artifactId>argeo-connect</artifactId>
-               <version>2.1.13-SNAPSHOT</version>
+               <groupId>org.argeo.commons</groupId>
+               <artifactId>argeo-commons</artifactId>
+               <version>2.1.12-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms</artifactId>
-       <name>Connect Content Management System</name>
+       <name>Argeo Content Management System</name>
        <packaging>jar</packaging>
-
-       <!-- TODO move to parent -->
-
-       <!-- <build> -->
-       <!-- <plugins> -->
-       <!-- <plugin> -->
-       <!-- <groupId>org.apache.felix</groupId> -->
-       <!-- <artifactId>maven-bundle-plugin</artifactId> -->
-       <!-- <configuration> -->
-       <!-- <instructions> -->
-       <!-- Different from plugin -->
-       <!-- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> -->
-       <!-- <Bundle-Activator>org.argeo.connect.files.web.Activator</Bundle-Activator> -->
-       <!-- <Require-Bundle>org.eclipse.rap.rwt;bundle-version="[2.2.0,3.0.0)"</Require-Bundle> -->
-       <!-- <Import-Package> -->
-       <!-- *, -->
-       <!-- org.springframework.core -->
-       <!-- </Import-Package> -->
-       <!-- </instructions> -->
-       <!-- </configuration> -->
-       <!-- </plugin> -->
-       <!-- </plugins> -->
-       <!-- </build> -->
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.server.jcr</artifactId>
-                       <version>${version.argeo-commons}</version>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.security.core</artifactId>
-                       <version>${version.argeo-commons}</version>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
                <!-- Files -->

diff --git a/pom.xml b/pom.xml
index b974816e065d15bbbfaa7cbf310f27acb637351d..753e8964392f685ecb4e2ff1abccd8d48a481394 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
                <module>org.argeo.server.rap.webapp</module>
                <!-- Node -->
                <module>org.argeo.node.repo.jackrabbit</module>
+               <module>org.argeo.cms</module>
                <!-- Standard Workbench Perspectives -->
                <module>org.argeo.osgi.ui.explorer</module>
                <module>org.argeo.jcr.ui.explorer</module>