From e71b1737815da9f0fdaff1ee1c69773a8c073ef1 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 25 Nov 2014 12:59:51 +0000
Subject: [PATCH] New project conventions

git-svn-id: https://svn.argeo.org/commons/trunk@7527 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.eclipse.ui.rap/.classpath           | 10 ++--
 .../.settings/org.eclipse.jdt.core.prefs      |  8 ---
 org.argeo.eclipse.ui.rap/bnd.bnd              | 12 ++++
 org.argeo.eclipse.ui.rap/build.properties     |  6 +-
 org.argeo.eclipse.ui.rap/pom.xml              | 56 ++-----------------
 .../ui/specific/DownloadServiceHandler.java   |  0
 .../ui/specific/EclipseUiSpecificUtils.java   |  0
 .../eclipse/ui/specific/FileHandler.java      |  0
 .../ui/specific/GenericUploadControl.java     |  0
 .../ui/specific/ImportToServerWizardPage.java |  0
 .../argeo/eclipse/ui/specific/OpenFile.java   |  0
 .../eclipse/ui/specific/OpenFileService.java  |  0
 .../argeo/eclipse/ui/specific/ThreadNLS.java  |  0
 .../ui/specific/UploadFileWizardPage.java     |  0
 14 files changed, 25 insertions(+), 67 deletions(-)
 delete mode 100644 org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.argeo.eclipse.ui.rap/bnd.bnd
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/FileHandler.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/GenericUploadControl.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/OpenFile.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/OpenFileService.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/ThreadNLS.java (100%)
 rename org.argeo.eclipse.ui.rap/src/{main/java => }/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java (100%)

diff --git a/org.argeo.eclipse.ui.rap/.classpath b/org.argeo.eclipse.ui.rap/.classpath
index 8cf7f48a0..d2953a684 100644
--- a/org.argeo.eclipse.ui.rap/.classpath
+++ b/org.argeo.eclipse.ui.rap/.classpath
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src" />
+	<classpathentry kind="con"
+		path="org.eclipse.pde.core.requiredPlugins" />
+	<classpathentry kind="con"
+		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
+	<classpathentry kind="output" path="bin" />
 </classpath>
diff --git a/org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs b/org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ffba01eed..000000000
--- a/org.argeo.eclipse.ui.rap/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Mar 02 13:27:08 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.argeo.eclipse.ui.rap/bnd.bnd b/org.argeo.eclipse.ui.rap/bnd.bnd
new file mode 100644
index 000000000..3e0cb3cab
--- /dev/null
+++ b/org.argeo.eclipse.ui.rap/bnd.bnd
@@ -0,0 +1,12 @@
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin 
+Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime
+Import-Package: org.apache.commons.io,\
+org.argeo,\
+org.springframework.beans.factory,\
+org.springframework.core.io.support,\
+!org.eclipse.rwt.widgets,\
+!org.eclipse.core.runtime,\
+!org.eclipse.core.commands,\
+!org.eclipse.ui.plugin,\
+*
diff --git a/org.argeo.eclipse.ui.rap/build.properties b/org.argeo.eclipse.ui.rap/build.properties
index 7cc98e7f8..fd806ca05 100644
--- a/org.argeo.eclipse.ui.rap/build.properties
+++ b/org.argeo.eclipse.ui.rap/build.properties
@@ -1,4 +1,2 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .,\
\ No newline at end of file
+source.. = src/
+output.. = bin/
diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index 0a8cb97a4..d2795efe6 100644
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -11,52 +11,6 @@
 	<artifactId>org.argeo.eclipse.ui.rap</artifactId>
 	<name>Commons Eclipse UI RAP</name>
 	<packaging>jar</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-
-				<configuration>
-					<instructions>
-						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-						<Bundle-Activator>org.argeo.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-						<Require-Bundle>org.eclipse.rap.ui,org.eclipse.core.runtime</Require-Bundle>
-						<!-- IMPORTANT : Note that we must exclude certain packages that are 
-							provided by dependencies to be sure that packages used in the current workspace 
-							are those provided by the require-bundles. Especially rwt.widgets.upload 
-							by instance. -->
-						<Import-Package>
-							org.apache.commons.io,
-							org.argeo,
-							org.springframework.beans.factory,
-							org.springframework.core.io.support,
-							!org.eclipse.rwt.widgets,
-							!org.eclipse.core.runtime,
-							!org.eclipse.core.commands,
-							!org.eclipse.ui.plugin,
-							*
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<!-- deleted from import package : javax.servlet, javax.servlet.http,org.argeo.eclipse.ui.dialogs, 
-		org.eclipse.jface.dialogs, -->
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
@@ -68,6 +22,11 @@
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>slf4j.org.apache.commons.logging</artifactId>
+		</dependency>
 
 		<!-- Argeo common distribution for RAP projects -->
 		<dependency>
@@ -77,10 +36,5 @@
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>slf4j.org.apache.commons.logging</artifactId>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/FileHandler.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/FileHandler.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/GenericUploadControl.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/GenericUploadControl.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFileService.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/OpenFileService.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/ThreadNLS.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/ThreadNLS.java
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
similarity index 100%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
rename to org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
-- 
2.30.2