Commons Eclipse, OSGi, Server migrated

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

diff --git a/eclipse/dep/org.argeo.eclipse.dep.common/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.common/pom.xml
index 3618330e6032200fc121ec6f346686c65c2fcd05..d4f1e84998c1671984581c44f67049cba65366e0 100644 (file)
--- a/eclipse/dep/org.argeo.eclipse.dep.common/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.common/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -12,33 +11,33 @@
        <dependencies>
                <!-- Eclipse -->
                <dependency>
-                       <groupId>org.eclipse.core</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.core.runtime</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.eclipse.core</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.core.commands</artifactId>
                </dependency>
                <dependency>
-                       <groupId>com.ibm.icu</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>com.ibm.icu</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.equinox.preferences</artifactId>
                        <version>3.3.0</version>
                </dependency>
                <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.equinox.launcher</artifactId>
                </dependency>
 
                <!-- Security -->
                <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.equinox.security</artifactId>
                </dependency>
 
                
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
index 221b9eba1f7003b144c8282f6887b8d5967ffe83..4f4c150ddde79bf265f12cd7f77add01ff782ecc 100644 (file)
--- a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -9,9 +10,6 @@
        </parent>
        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
        <name>Commons Eclipse RAP Dependencies</name>
-       <properties>
-               <version.rap>1.3.2</version.rap>
-       </properties>
        <build>
                <plugins>
                        <plugin>
@@ -21,93 +19,71 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- common dependencies for both RCP and RAP -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
-                       <version>1.1.1-SNAPSHOT</version>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>binaries</artifactId>
+                       <version>${version.argeo-distribution}</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>
+
+                               <!-- Demo -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.demo</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.demo.databinding</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.design.example</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
                <!-- Dependency to enable file upload. Should be included directly in coming 
                        rap distribution -->
                <dependency>
-                       <groupId>org.argeo.dep.rap</groupId>
+                       <groupId>org.argeo.tp.rap</groupId>
                        <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
+                       <version>1.0.0.argeo002</version>
                </dependency>
                <!-- Needed by the bundle above -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
 
                <!-- RAP Specific Dependencies -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.registry</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                </dependency>
 
-               <!-- RAP -->
-               <!-- order IS important -->
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.rwt</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.rwt.q07</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.jface</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.jface.databinding</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.forms</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.views</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui.workbench</artifactId>
-               </dependency>
-
-               <!-- Jetty (TO BE REMOVED and replaced by Tomcat <dependency> <groupId>org.eclipse.equinox</groupId> 
-                       <artifactId>org.eclipse.equinox.http.jetty</artifactId> </dependency> <dependency> 
-                       <groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.server</artifactId> 
-                       </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>org.mortbay.jetty.util</artifactId> 
-                       </dependency> -->
-
-               <!-- Eclipse -->
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.databinding</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.databinding.beans</artifactId>
-               </dependency>
        </dependencies>
        <profiles>
                <profile>
@@ -175,7 +151,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>
@@ -187,4 +164,4 @@
                        </build>
                </profile>
        </profiles>
-</project>
+</project>
\ No newline at end of file

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
index 8365cdf7c1dd84a69dbe986b62cfc57d4f79d816..c8991323061cf3bac588c73a7042bdb69669f61e 100644 (file)
--- a/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rcp/pom.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -61,40 +62,141 @@ ex=*.source_*.jar,\
                </plugins>
        </build>
        <dependencies>
-               <!-- common dependencies for both RCP and RAP -->
                <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
-                       <version>1.1.1-SNAPSHOT</version>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.eclipse.ui</groupId>
-                       <artifactId>org.eclipse.ui</artifactId>
-               </dependency>
-
-               <!-- forms -->
-               <dependency>
-                       <groupId>org.eclipse.ui</groupId>
-                       <artifactId>org.eclipse.ui.forms</artifactId>
-               </dependency>
+                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                       <artifactId>binaries</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <type>pom</type>
+                       <exclusions>
+                               <!-- SWT -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.carbon.macosx</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.solaris.sparc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.solaris.x86</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.motif.solaris.sparc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.linux.s390</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.linux.s390x</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.linux.ppc64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.motif.linux.x86</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.linux.ppc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.photon.qnx.x86</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.motif.aix.ppc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.motif.aix.ppc64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.motif.hpux.ia64_32</artifactId>
+                               </exclusion>
 
-               <!-- SWT -->
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+                               <!-- Equinox Launcher -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.win32.win32.x86_64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.carbon.macosx</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.cocoa.macosx.x86_64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.solaris.sparc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.solaris.x86</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.motif.solaris.sparc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390x</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.motif.linux.x86</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.photon.qnx.x86</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.motif.aix.ppc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.motif.aix.ppc64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.motif.hpux.ia64_32</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
        </dependencies>
        <profiles>
@@ -122,4 +224,4 @@ ex=*.source_*.jar,\
                        </build>
                </profile>
        </profiles>
-</project>
+</project>
\ No newline at end of file

diff --git a/eclipse/dep/pom.xml b/eclipse/dep/pom.xml
index 3c233d22a4f874bdb1d4baf8bca3ef737d408eef..dce80c25e9393f880208652c4b62e38947962276 100644 (file)
--- a/eclipse/dep/pom.xml
+++ b/eclipse/dep/pom.xml
@@ -11,7 +11,7 @@
        <name>Commons Eclipse Dependencies</name>
        <packaging>pom</packaging>
        <modules>
-               <module>org.argeo.eclipse.dep.common</module>
+<!--           <module>org.argeo.eclipse.dep.common</module> -->
                <module>org.argeo.eclipse.dep.rap</module>
                <module>org.argeo.eclipse.dep.rcp</module>
        </modules>

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml
index 6fdca3dee8797a3bb98ddfab24fb54f87468a9a4..87a8c81e694f8edcabfb40710cd264d9674e093f 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -42,14 +42,6 @@
                </plugins>
        </build>
        <dependencies>
-
-               <!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
-                       <version>1.1.1-SNAPSHOT</version>
-               </dependency>
-
                <dependency>
                        <groupId>org.argeo.commons.eclipse</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
@@ -58,8 +50,8 @@
 
                <!-- JCR -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jcr</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
@@ -90,8 +82,8 @@
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
index e6a43484dee62547c9fa4c3c711a7b8d8db04cd9..7c679eae86c266cb2c62b581a768d2996849ecf0 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -56,13 +56,12 @@
        <!-- deleted from import package : javax.servlet, javax.servlet.http,org.argeo.eclipse.ui.dialogs, 
                org.eclipse.jface.dialogs, -->
        <dependencies>
-               <!-- Argeo Commons for Eclipse (not specific) -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <dependency>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.nodeps</artifactId>
                        <version>1.1.1-SNAPSHOT</version>
                </dependency>
-
+       
                <!-- Argeo common distribution for RAP projects -->
                <dependency>
                        <groupId>org.argeo.commons.eclipse</groupId>
@@ -70,15 +69,10 @@
                        <version>1.1.1-SNAPSHOT</version>
                </dependency>
 
-               <dependency>
-                       <groupId>org.argeo.dep.rap</groupId>
-                       <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
-               </dependency>
-
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml
index 562822b6d62a9d03fc930ddd16630be3b7aea934..cc0dd3d9d4de0bc6b45f2df94c7a537c90a03273 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -71,14 +71,14 @@
 
                <!-- Others. -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/eclipse/runtime/org.argeo.eclipse.ui/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui/pom.xml
index 0d60226d53572ce01da6490825128e02714380eb..e19b25648834f8a6ae3113a1bc1242a330c0fe55 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui/pom.xml
+++ b/eclipse/runtime/org.argeo.eclipse.ui/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -47,18 +47,10 @@
                </plugins>
        </build>
        <dependencies>
-
-               <!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.common</artifactId>
-                       <version>1.1.1-SNAPSHOT</version>
-               </dependency>
-
                <!-- JCR -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jcr</artifactId>
                </dependency>
 
                <!-- RCP only dependency, needed at compile time -->
@@ -78,19 +70,19 @@
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.context</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
 
                <!-- Others -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/osgi/dep/org.argeo.osgi.dep.jackrabbit/pom.xml b/osgi/dep/org.argeo.osgi.dep.jackrabbit/pom.xml
index 5bb7671bead71cc59d2c98d8b824f65428c9dcce..00f7756e6bf916021dc839c0d7a0be185b6e00da 100644 (file)
--- a/osgi/dep/org.argeo.osgi.dep.jackrabbit/pom.xml
+++ b/osgi/dep/org.argeo.osgi.dep.jackrabbit/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.osgi</groupId>
@@ -19,24 +19,24 @@
 
                <!-- Jackrabbit -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jackrabbit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.jackrabbit</artifactId>
                </dependency>
 
                <!-- Database -->
                <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>com.springsource.org.h2</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.h2</artifactId>
                </dependency>
 
                <!-- Transitive dependencies -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jcr</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.lucene</groupId>
-                       <artifactId>com.springsource.org.apache.lucene</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.lucene</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.basic</groupId>
@@ -45,79 +45,73 @@
                        <type>pom</type>
                </dependency>
 
-               <!-- Javax -->
-               <dependency>
-                       <groupId>javax.xml.stream</groupId>
-                       <artifactId>com.springsource.javax.xml.stream</artifactId>
-               </dependency>
-
                <!-- Commons -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.collections</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.collections</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.httpclient</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.httpclient</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.fileupload</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.compress</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.compress</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.pool</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.pool</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.dbcp</artifactId>
                </dependency>
 
                <!-- Misc -->
                <dependency>
-                       <groupId>edu.oswego.cs.concurrent</groupId>
-                       <artifactId>com.springsource.edu.oswego.cs.dl.util.concurrent</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>edu.oswego.cs.dl.util.concurrent</artifactId>
                </dependency>
 
                <!-- For webdav -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                </dependency>
 
                <!-- Tika -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.tika</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.tika</artifactId>
                </dependency>
                <!-- Required for OSGi completion -->
                <dependency>
-                       <groupId>org.dom4j</groupId>
-                       <artifactId>com.springsource.org.dom4j</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.dom4j</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.jdom</groupId>
-                       <artifactId>com.springsource.org.jdom</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.jdom</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.objectweb.asm</groupId>
-                       <artifactId>com.springsource.org.objectweb.asm</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.objectweb.asm</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.jaxen</groupId>
-                       <artifactId>com.springsource.org.jaxen</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.jaxen</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.xmlpull</groupId>
-                       <artifactId>com.springsource.org.xmlpull</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.xmlpull</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml b/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml
index cbd213d45202c898c695ac95fcae7c229564b478..30a4fbab863c1293cbb8bf9ae496c5a39c94f733 100644 (file)
--- a/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml
+++ b/osgi/plugins/org.argeo.osgi.ui.explorer/pom.xml
@@ -27,6 +27,11 @@
                </plugins>
        </build>
        <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
                <dependency>
                        <groupId>org.argeo.commons.eclipse</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>

diff --git a/osgi/runtime/org.argeo.osgi.boot/pom.xml b/osgi/runtime/org.argeo.osgi.boot/pom.xml
index 477e136979a24c0746b82468cdfa8519ef0e475d..871d616da87a0f5e4b0c3efd651e7041e55361b3 100644 (file)
--- a/osgi/runtime/org.argeo.osgi.boot/pom.xml
+++ b/osgi/runtime/org.argeo.osgi.boot/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.osgi</groupId>
@@ -34,17 +34,17 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
 
                <!-- TEST -->
                <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
        </dependencies>
 
 
-</project>
+</project>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 089246bb44498c5442fc82395bfe4bb17deb5e33..2f6a50337805dbaf845d10d096ec2a1fe522653e 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.security</groupId>
@@ -70,40 +70,48 @@
                <!-- <groupId>org.argeo.dep.osgi</groupId> -->
                <!-- <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId> -->
                <!-- </dependency> -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.codec</artifactId>
+               </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.beans</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.context</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.transaction</artifactId>
                </dependency>
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>com.springsource.org.apache.log4j</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.log4j</artifactId>
                        <optional>true</optional>
                </dependency>
 
                <!-- TEST -->
                <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -120,10 +128,10 @@
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>com.springsource.json</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>com.springsource.json</artifactId>
                        <scope>test</scope>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml
index 586223def62ddcb8d3f2e5afe2494137d1450bc6..7e3dae827bc9ab4fc12708fd36f72dd9804c83b4 100644 (file)
--- a/server/dep/org.argeo.server.dep.activemq/pom.xml
+++ b/server/dep/org.argeo.server.dep.activemq/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -20,38 +20,38 @@
 
                <!-- JMS / ActiveMQ -->
                <dependency>
-                       <groupId>javax.jms</groupId>
-                       <artifactId>com.springsource.javax.jms</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jms</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.activemq</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.activemq</groupId>
-                       <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.activemq.pool</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.pool</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.pool</artifactId>
                </dependency>
 
                <!-- Required by ActiveMQ bundles -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.net</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.net</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>com.springsource.javax.management.j2ee</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.management.j2ee</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.ejb</groupId>
-                       <artifactId>com.springsource.javax.ejb</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.ejb</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.rpc</groupId>
-                       <artifactId>com.springsource.javax.xml.rpc</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.xml.rpc</artifactId>
                </dependency>
 
                <!-- Test OSGi -->
@@ -63,27 +63,27 @@
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.apache.xmlcommons</groupId>
-                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xmlcommons</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.apache.xalan</groupId>
-                       <artifactId>com.springsource.org.apache.xalan</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xalan</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.beans</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.context</artifactId>
                        <scope>test</scope>
                </dependency>
@@ -95,17 +95,17 @@
 <!--           </dependency> -->
                
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.collections</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.collections</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.ws</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.oxm</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.ws</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.xml</artifactId>
                        <scope>test</scope>
                </dependency>

diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/server/dep/org.argeo.server.dep.ads/pom.xml
index a8fbe9d7d617b16d2e5ef0eb2d8d05aa1ac0807c..b860c5d166ccf0ae92eb6d6a30409c6e542a6455 100644 (file)
--- a/server/dep/org.argeo.server.dep.ads/pom.xml
+++ b/server/dep/org.argeo.server.dep.ads/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -20,24 +20,24 @@
 
                <!-- Apache Directory -->
                <dependency>
-                       <groupId>org.apache.directory</groupId>
-                       <artifactId>com.springsource.org.apache.directory.server.core</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.directory.server.core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.directory.shared.asn.codec</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.directory.shared.asn.codec</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.mina.filter.ssl</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.mina.filter.ssl</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.directory</groupId>
-                       <artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.directory.server.jndi</artifactId>
                </dependency>
                <dependency>
-                       <groupId>net.sourceforge.jdbm</groupId>
-                       <artifactId>com.springsource.jdbm</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>jdbm</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
@@ -47,8 +47,8 @@
                <!-- TODO: version 2.4.0 is required by Spring-LDAP while Apache Directory 
                        takes 2.1.0 -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.lang</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.lang</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.hibernate/pom.xml b/server/dep/org.argeo.server.dep.hibernate/pom.xml
index dfe8bd862340c39c8dd65b7a21a8cfcd203ad87c..723b9e3c86a0be2ee06b2f4fdac571afeb0b1bce 100644 (file)
--- a/server/dep/org.argeo.server.dep.hibernate/pom.xml
+++ b/server/dep/org.argeo.server.dep.hibernate/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -20,22 +20,14 @@
 
                <!-- Hibernate -->
                <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>com.springsource.org.hibernate</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.hibernate</artifactId>
                </dependency>
 
                <!-- JEE -->
                <dependency>
-                       <groupId>javax.transaction</groupId>
-                       <artifactId>com.springsource.javax.transaction</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>edu.emory.mathcs.backport</groupId>
-                       <artifactId>com.springsource.edu.emory.mathcs.backport</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.stream</groupId>
-                       <artifactId>com.springsource.javax.xml.stream</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>edu.emory.mathcs.backport</artifactId>
                </dependency>
 
        </dependencies>

diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
index ab393ac453816d902fc36f7b454972f69a481c7b..583456edf10fb188bcf65f1eeb198b51d6802629 100644 (file)
--- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
+++ b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -19,12 +19,12 @@
 
                <!-- Enhancements of Jackrabbit -->
                <dependency>
-                       <groupId>org.bouncycastle</groupId>
-                       <artifactId>bcprov-jdk15on</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>bcprov</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.bouncycastle</groupId>
-                       <artifactId>bcmail-jdk15on</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>bcmail</artifactId>
                </dependency>
                <!-- Provides org.bouncycastle.cms in v1.47 (bcmail not necessary anymore) -->
                <!-- <dependency> -->
@@ -32,48 +32,48 @@
                <!-- <artifactId>bcpkix-jdk15on</artifactId> -->
                <!-- </dependency> -->
                <dependency>
-                       <groupId>org.apache.xmlbeans</groupId>
-                       <artifactId>com.springsource.org.apache.xmlbeans</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xmlbeans</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.xmlcommons</groupId>
-                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xmlcommons</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.pdfbox</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.pdfbox</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.poi</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.poi</artifactId>
                </dependency>
                <dependency>
-                       <groupId>com.sun.syndication</groupId>
-                       <artifactId>com.springsource.com.sun.syndication</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>com.sun.syndication</artifactId>
                </dependency>
                <dependency>
-                       <groupId>net.sourceforge.nekohtml</groupId>
-                       <artifactId>com.springsource.org.cyberneko.html</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.cyberneko.html</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.boilerpipe</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>de.l3s.boilerpipe</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.mail</groupId>
-                       <artifactId>com.springsource.javax.mail</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.mail</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.drewnoakes.metadata_extractor</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>com.drewnoakes.metadata_extractor</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.netcdf</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>edu.ucar.unidata.netcdf</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.tagsoup</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.ccil.cowan.tagsoup</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.javax/pom.xml b/server/dep/org.argeo.server.dep.javax/pom.xml
index 0c3764317d97880f02be4e7ff404bfb5bd942471..0858e9e9626005a3c8a497b35da6dc9de38a21a7 100644 (file)
--- a/server/dep/org.argeo.server.dep.javax/pom.xml
+++ b/server/dep/org.argeo.server.dep.javax/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -12,32 +12,32 @@
        <description>Component provided by Java 6</description>
        <dependencies>
                <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.activation</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>com.springsource.javax.annotation</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.annotation</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.transaction</groupId>
-                       <artifactId>com.springsource.javax.transaction</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.transaction</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.stream</groupId>
-                       <artifactId>com.springsource.javax.xml.stream</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.xml.stream</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.xml.bind</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.soap</groupId>
-                       <artifactId>com.springsource.javax.xml.soap</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.xml.soap</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.xml.ws</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index f6ed8114f15848ceb8998750a0689ff50d53064f..dd911d6b3d087e9ea0f76bf4046d4ad7b14eca19 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -32,64 +32,64 @@
 
                <!-- JEE -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet.jsp</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.persistence</groupId>
-                       <artifactId>com.springsource.javax.persistence</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.persistence</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>com.springsource.javax.management.j2ee</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.management.j2ee</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.ejb</groupId>
-                       <artifactId>com.springsource.javax.ejb</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.ejb</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.rpc</groupId>
-                       <artifactId>com.springsource.javax.xml.rpc</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.xml.rpc</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet.jsp.jstl</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.el</groupId>
-                       <artifactId>com.springsource.javax.el</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.el</artifactId>
                </dependency>
 
                <!-- Taglibs -->
                <dependency>
-                       <groupId>org.apache.taglibs</groupId>
-                       <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.taglibs.standard</artifactId>
                </dependency>
 
                <!-- Tomcat -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.coyote</groupId>
-                       <artifactId>com.springsource.org.apache.coyote</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.coyote</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.catalina</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.jasper</groupId>
-                       <artifactId>com.springsource.org.apache.jasper</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.jasper</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.el</artifactId>
                </dependency>
 
                <!-- Test with Javax -->
@@ -101,8 +101,8 @@
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.apache.xmlcommons</groupId>
-                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xmlcommons</artifactId>
                        <scope>test</scope>
                </dependency>
        </dependencies>

diff --git a/server/dep/pom.xml b/server/dep/pom.xml
index ddce79e2521baca25526f9f073fc80c34ed35921..eac6d5d982f0096b312d84df31cbac0dd630a176 100644 (file)
--- a/server/dep/pom.xml
+++ b/server/dep/pom.xml
@@ -12,7 +12,7 @@
        <name>Commons Server Dependencies</name>
        <packaging>pom</packaging>
        <modules>
-               <module>org.argeo.server.dep.javax</module>
+<!--           <module>org.argeo.server.dep.javax</module> -->
                <module>org.argeo.server.dep.tomcat</module>
                <module>org.argeo.server.dep.ads</module>
                <module>org.argeo.server.dep.hibernate</module>

diff --git a/server/runtime/org.argeo.server.ads/pom.xml b/server/runtime/org.argeo.server.ads/pom.xml
index 5a47a3e9eceada36bf9bb0f9c1aa7fb444c1c692..be58adbb74e75b47af2ce77d24be2dcf4b33b22d 100644 (file)
--- a/server/runtime/org.argeo.server.ads/pom.xml
+++ b/server/runtime/org.argeo.server.ads/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -45,8 +45,8 @@
 
                <!-- Apache DS -->
                <dependency>
-                       <groupId>org.apache.directory</groupId>
-                       <artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.directory.server.jndi</artifactId>
                        <exclusions>
                                <!--
                                        Workaround for a weird issue where the underlying version from
@@ -61,24 +61,28 @@
 
                <!-- Apache Commons -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.beans</artifactId>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.api</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.api</artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml
index 98803cb7ef68eb823762e87bdb6eaf581ccada40..340af14d0dd07cc0d7e1dcbc4b4508029baabc1b 100644 (file)
--- a/server/runtime/org.argeo.server.core/pom.xml
+++ b/server/runtime/org.argeo.server.core/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -46,31 +46,35 @@
 
                <!-- Apache Commons -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.web</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.web.servlet</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.ws</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.oxm</artifactId>
                </dependency>
 
                <!-- J2EE -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.hibernate/pom.xml b/server/runtime/org.argeo.server.hibernate/pom.xml
index e53bf2eb4299caf58cc308954b822cff8bd24c15..f0cf6bbacf187ef77a3f59dd77d47b187482980e 100644 (file)
--- a/server/runtime/org.argeo.server.hibernate/pom.xml
+++ b/server/runtime/org.argeo.server.hibernate/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -52,20 +52,20 @@
                </dependency>
 
                <dependency>
-                       <groupId>net.sourceforge.ehcache</groupId>
-                       <artifactId>com.springsource.net.sf.ehcache</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>net.sf.ehcache</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.orm</artifactId>
                </dependency>
                <dependency>
                        <!-- For EhCache support -->
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.context.support</artifactId>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml
index 0d1d7e65554ac97985d55e6722774d34f9b34180..a1abc9364a856079627e791fb9bec92ead8639f0 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/pom.xml
+++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -76,22 +76,22 @@
 
                <!-- OSGi -->
                <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                        <scope>provided</scope>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.beans</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.web.servlet</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.ws</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.xml</artifactId>
                </dependency>
 
@@ -110,4 +110,4 @@
                        <scope>test</scope>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.jcr.mvc/pom.xml b/server/runtime/org.argeo.server.jcr.mvc/pom.xml
index b58b23cf2c1fa3b41e5ca4aeb92127a9910c8837..07368fc63f3a79f4fa349011252645c8143f3734 100644 (file)
--- a/server/runtime/org.argeo.server.jcr.mvc/pom.xml
+++ b/server/runtime/org.argeo.server.jcr.mvc/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -54,35 +54,35 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.web.servlet</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.springframework.ws</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.xml</artifactId>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.fileupload</artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index c6546becdbf1c222e53b60bf33ce9523cc199197..50117ca731a2b51717b8abb29d946c93ab886e11 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -65,40 +65,45 @@
 
                <!-- JCR -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jcr</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.core</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.beans</artifactId>
                        <scope>provided</scope>
                </dependency>
 
                <!-- OSGi -->
                <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                        <scope>provided</scope>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
 
                <!-- TEST -->
                <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
                        <optional>true</optional>
                </dependency>
                <dependency>
@@ -128,4 +133,4 @@
                        <scope>test</scope>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.json/pom.xml b/server/runtime/org.argeo.server.json/pom.xml
index 85715d54d4253e9dc7a4504557f8db3d0f81b2d5..c6f75763c7411e6ce448cadcfc5dead9d7e06f48 100644 (file)
--- a/server/runtime/org.argeo.server.json/pom.xml
+++ b/server/runtime/org.argeo.server.json/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -46,42 +46,42 @@
 
                <!-- JSON  -->
                <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.codehaus.jackson.mapper</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.web.servlet</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.osgi.core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
 
                <!-- J2EE -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
                <!-- TEST -->
                <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.jxl/pom.xml b/server/runtime/org.argeo.server.jxl/pom.xml
index 83d333abbefce74e503c64797d72cdabccdc71c8..f1f3065d7c4162605bb8f6df41e94be8994c3e32 100644 (file)
--- a/server/runtime/org.argeo.server.jxl/pom.xml
+++ b/server/runtime/org.argeo.server.jxl/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -46,14 +46,14 @@
 
                <!-- JXL  -->
                <dependency>
-                       <groupId>net.sourceforge.jexcelapi</groupId>
-                       <artifactId>com.springsource.jxl</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>jxl</artifactId>
                </dependency>
 
                <!-- TEST -->
                <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -66,4 +66,4 @@
 
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.modeshape/pom.xml b/server/runtime/org.argeo.server.modeshape/pom.xml
index d7dbc3cff8c2d6ed6043f122628bcf1af4cfa2f3..0927a43b75ea61df04395985edbc7604526237d9 100644 (file)
--- a/server/runtime/org.argeo.server.modeshape/pom.xml
+++ b/server/runtime/org.argeo.server.modeshape/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -44,13 +44,13 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.modeshape</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.modeshape</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jcr</artifactId>
                </dependency>
 
                <dependency>
@@ -68,4 +68,4 @@
                        <scope>test</scope>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.webextender/pom.xml b/server/runtime/org.argeo.server.webextender/pom.xml
index 45e8d0f5b3873533153fe2d979de8fce3f7d4647..86ab5119a47d8bdd7006d273486b734c1eb2c49a 100644 (file)
--- a/server/runtime/org.argeo.server.webextender/pom.xml
+++ b/server/runtime/org.argeo.server.webextender/pom.xml
@@ -1,4 +1,4 @@
-<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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -40,28 +40,32 @@
        <dependencies>
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.osgi.web</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.osgi.web.extender</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.catalina</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.beans</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file