Adapt to changes in Argeo TP.

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

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 0fd2deb9061611a798a403167bc60d4e8bbd4cfa..9069ac53a87d0a8602e24e87dc044f5aca23a1a2 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
@@ -189,6 +190,12 @@
                        <artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
                </dependency>
 
+               <!-- Required by Jackrabbit 2.12 -->
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>com.google.guava</artifactId>
+               </dependency>
+
                <!-- Test only -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 2fea68f0488ad7960b1422b14866dccddd238349..9d309d6f3f9ceba3174c53d87f15fea0a461ff92 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
@@ -73,10 +74,6 @@
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>com.steadystate.css</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>com.google.guava</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>com.google.gson</artifactId>
@@ -126,12 +123,12 @@
                        <artifactId>org.eclipse.rap.jface</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap</groupId>
-                       <artifactId>org.eclipse.rap.addons.filedialog</artifactId>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>org.eclipse.rap.filedialog</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap</groupId>
-                       <artifactId>org.eclipse.rap.addons.fileupload</artifactId>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>org.eclipse.rap.fileupload</artifactId>
                </dependency>
 
                <!-- TODO: remove Spring dependency -->

diff --git a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
index 98566485963e8231e6fac23e5caed93b46f40640..65110619b13b00fa77ed57fcd356dba82c3b5661 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
+++ b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
@@ -33,11 +33,11 @@ import org.argeo.cms.widgets.StyledControl;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.rap.addons.fileupload.FileDetails;
-import org.eclipse.rap.addons.fileupload.FileUploadEvent;
-import org.eclipse.rap.addons.fileupload.FileUploadHandler;
-import org.eclipse.rap.addons.fileupload.FileUploadListener;
-import org.eclipse.rap.addons.fileupload.FileUploadReceiver;
+import org.eclipse.rap.fileupload.FileDetails;
+import org.eclipse.rap.fileupload.FileUploadEvent;
+import org.eclipse.rap.fileupload.FileUploadHandler;
+import org.eclipse.rap.fileupload.FileUploadListener;
+import org.eclipse.rap.fileupload.FileUploadReceiver;
 import org.eclipse.rap.rwt.service.ServerPushSession;
 import org.eclipse.rap.rwt.widgets.FileUpload;
 import org.eclipse.swt.SWT;

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/JcrFileUploadReceiver.java b/org.argeo.cms/src/org/argeo/cms/internal/JcrFileUploadReceiver.java
index 6b91295ec6b37706b1c74d4ea8d62c40d231eabe..a2ff49624266c6f4c0752d2a9186cbef6605f8bc 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/JcrFileUploadReceiver.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/JcrFileUploadReceiver.java
@@ -15,8 +15,8 @@ import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsImageManager;
 import org.argeo.cms.CmsNames;
 import org.argeo.jcr.JcrUtils;
-import org.eclipse.rap.addons.fileupload.FileDetails;
-import org.eclipse.rap.addons.fileupload.FileUploadReceiver;
+import org.eclipse.rap.fileupload.FileDetails;
+import org.eclipse.rap.fileupload.FileUploadReceiver;
 
 public class JcrFileUploadReceiver extends FileUploadReceiver implements
                CmsNames {

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java b/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java
index e296388249924075d9dc4ce94c33c5939f85984c..cb0b3a974197ee4d92f53b5eb6570c3b7629b0af 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/text/AbstractTextViewer.java
@@ -38,10 +38,10 @@ import org.argeo.cms.widgets.EditableImage;
 import org.argeo.cms.widgets.EditableText;
 import org.argeo.cms.widgets.StyledControl;
 import org.argeo.jcr.JcrUtils;
-import org.eclipse.rap.addons.fileupload.FileDetails;
-import org.eclipse.rap.addons.fileupload.FileUploadEvent;
-import org.eclipse.rap.addons.fileupload.FileUploadHandler;
-import org.eclipse.rap.addons.fileupload.FileUploadListener;
+import org.eclipse.rap.fileupload.FileDetails;
+import org.eclipse.rap.fileupload.FileUploadEvent;
+import org.eclipse.rap.fileupload.FileUploadHandler;
+import org.eclipse.rap.fileupload.FileUploadListener;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;

diff --git a/org.argeo.cms/src/org/argeo/cms/text/Img.java b/org.argeo.cms/src/org/argeo/cms/text/Img.java
index 638fae41d4d98609282524d0f7854d00275aad56..8c23109bfade8513d77a65432cb3abc12dd55175 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/text/Img.java
+++ b/org.argeo.cms/src/org/argeo/cms/text/Img.java
@@ -11,9 +11,9 @@ import org.argeo.cms.viewers.NodePart;
 import org.argeo.cms.viewers.Section;
 import org.argeo.cms.viewers.SectionPart;
 import org.argeo.cms.widgets.EditableImage;
-import org.eclipse.rap.addons.fileupload.FileUploadHandler;
-import org.eclipse.rap.addons.fileupload.FileUploadListener;
-import org.eclipse.rap.addons.fileupload.FileUploadReceiver;
+import org.eclipse.rap.fileupload.FileUploadHandler;
+import org.eclipse.rap.fileupload.FileUploadListener;
+import org.eclipse.rap.fileupload.FileUploadReceiver;
 import org.eclipse.rap.rwt.service.ServerPushSession;
 import org.eclipse.rap.rwt.widgets.FileUpload;
 import org.eclipse.swt.SWT;

diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
index 8c8498fe6bba9ab41bc2a367b486c112099749ee..d68f84290decb115245cfb8ae81fc6639a3ea380 100644 (file)
--- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
+++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
@@ -23,11 +23,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.rap.addons.fileupload.FileDetails;
-import org.eclipse.rap.addons.fileupload.FileUploadEvent;
-import org.eclipse.rap.addons.fileupload.FileUploadHandler;
-import org.eclipse.rap.addons.fileupload.FileUploadListener;
-import org.eclipse.rap.addons.fileupload.FileUploadReceiver;
+import org.eclipse.rap.fileupload.FileDetails;
+import org.eclipse.rap.fileupload.FileUploadEvent;
+import org.eclipse.rap.fileupload.FileUploadHandler;
+import org.eclipse.rap.fileupload.FileUploadListener;
+import org.eclipse.rap.fileupload.FileUploadReceiver;
 import org.eclipse.rap.rwt.service.ServerPushSession;
 import org.eclipse.rap.rwt.widgets.FileUpload;
 import org.eclipse.swt.SWT;

diff --git a/pom.xml b/pom.xml
index 057a8f7d9e7181e35b37ff5ed8cfec9b7f2a73e6..7c5846fcef325fa22d8b09eea2100403249d954b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
                <version.argeo-commons>2.1.41-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.14</version.argeo-distribution>
+               <version.argeo-distribution>2.1.15</version.argeo-distribution>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
@@ -422,6 +422,7 @@ limitations under the License.
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
+               <!-- Disable Maven default repository -->
                <repository>
                        <id>central</id>
                        <url>http://repo1.maven.org/maven2</url>