From 1ad11f24091dc24be44b8367f52625d8cb859259 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Tue, 1 Mar 2011 18:24:30 +0000 Subject: [PATCH] New specific projects to handle differences between RAP & RCP that cannot be handled with single sourcing. git-svn-id: https://svn.argeo.org/commons/trunk@4254 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../eclipse/ui/jcr/browser/WorkspaceNode.java | 2 +- .../org.argeo.eclipse.ui.rap/build.properties | 4 ++ .../runtime/org.argeo.eclipse.ui.rap/pom.xml | 57 +++++++++++++++++++ .../org.argeo.eclipse.ui.rcp/build.properties | 4 ++ .../runtime/org.argeo.eclipse.ui.rcp/pom.xml | 57 +++++++++++++++++++ eclipse/runtime/pom.xml | 5 +- 6 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 eclipse/runtime/org.argeo.eclipse.ui.rap/build.properties create mode 100644 eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml create mode 100644 eclipse/runtime/org.argeo.eclipse.ui.rcp/build.properties create mode 100644 eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/WorkspaceNode.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/WorkspaceNode.java index 8cbf1a2b1..7621d37a0 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/WorkspaceNode.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/browser/WorkspaceNode.java @@ -22,7 +22,7 @@ public class WorkspaceNode extends TreeParent implements EventListener { .getImageDescriptor("icons/workspace_connected.png").createImage(); public WorkspaceNode(Repository repository, String name) { - this(repository, name, null); + this(repository, name, null); } public WorkspaceNode(Repository repository, String name, Session session) { diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/build.properties b/eclipse/runtime/org.argeo.eclipse.ui.rap/build.properties new file mode 100644 index 000000000..7cc98e7f8 --- /dev/null +++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/build.properties @@ -0,0 +1,4 @@ +source.. = src/main/java/ +output.. = target/classes/ +bin.includes = META-INF/,\ + .,\ \ 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 new file mode 100644 index 000000000..a0009ca93 --- /dev/null +++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/pom.xml @@ -0,0 +1,57 @@ + + 4.0.0 + + org.argeo.commons.eclipse + 0.2.3-SNAPSHOT + runtime + .. + + org.argeo.eclipse.ui.rap + Commons Eclipse UI RAP + jar + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + ${version.maven-bundle-plugin} + + + lazy + org.argeo.eclipse.ui.ArgeoUiPlugin + org.eclipse.rap.ui,org.eclipse.core.runtime + + org.springframework.beans.factory, + org.springframework.core.io.support, + !org.eclipse.core.runtime, + !org.eclipse.core.commands, + !org.eclipse.ui.plugin, + * + + + + + + + + + + org.argeo.commons.eclipse + org.argeo.eclipse.ui + 0.2.3-SNAPSHOT + + + diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rcp/build.properties b/eclipse/runtime/org.argeo.eclipse.ui.rcp/build.properties new file mode 100644 index 000000000..886a20027 --- /dev/null +++ b/eclipse/runtime/org.argeo.eclipse.ui.rcp/build.properties @@ -0,0 +1,4 @@ +source.. = src/main/java/ +output.. = target/classes/ +bin.includes = META-INF/,\ + .,\ diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml new file mode 100644 index 000000000..bcaca0535 --- /dev/null +++ b/eclipse/runtime/org.argeo.eclipse.ui.rcp/pom.xml @@ -0,0 +1,57 @@ + + 4.0.0 + + org.argeo.commons.eclipse + 0.2.3-SNAPSHOT + runtime + .. + + org.argeo.eclipse.ui.rcp + Commons Eclipse UI RCP + jar + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + ${version.maven-bundle-plugin} + + + lazy + org.argeo.eclipse.ui.ArgeoUiPlugin + org.eclipse.ui,org.eclipse.core.runtime + + org.springframework.beans.factory, + org.springframework.core.io.support, + !org.eclipse.core.runtime, + !org.eclipse.core.commands, + !org.eclipse.ui.plugin, + * + + + + + + + + + + org.argeo.commons.eclipse + org.argeo.eclipse.ui + 0.2.3-SNAPSHOT + + + \ No newline at end of file diff --git a/eclipse/runtime/pom.xml b/eclipse/runtime/pom.xml index 338373b99..d7b7c1468 100644 --- a/eclipse/runtime/pom.xml +++ b/eclipse/runtime/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.commons.eclipse @@ -11,6 +12,8 @@ pom org.argeo.eclipse.ui + org.argeo.eclipse.ui.rap + org.argeo.eclipse.ui.rcp org.argeo.eclipse.ui.jcr -- 2.30.2