From 864072113f7a44fd2a291a4cb50659d6e67f8c29 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 25 Nov 2014 13:03:32 +0000 Subject: [PATCH] New project conventions git-svn-id: https://svn.argeo.org/commons/trunk@7529 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.eclipse.ui.rcp/.classpath | 10 ++++++---- .../.settings/org.eclipse.jdt.core.prefs | 8 -------- org.argeo.eclipse.ui.rcp/bnd.bnd | 11 +++++++++++ org.argeo.eclipse.ui.rcp/build.properties | 6 ++---- .../org/argeo/eclipse/ui/specific/DefaultNLS.java | 0 .../eclipse/ui/specific/EclipseUiSpecificUtils.java | 0 .../org/argeo/eclipse/ui/specific/FileHandler.java | 0 .../org/argeo/eclipse/ui/specific/FileProvider.java | 0 .../eclipse/ui/specific/GenericUploadControl.java | 0 .../eclipse/ui/specific/ImportToServerWizardPage.java | 0 .../org/argeo/eclipse/ui/specific/OpenFile.java | 0 .../org/argeo/eclipse/ui/specific/ThreadNLS.java | 0 .../eclipse/ui/specific/UploadFileWizardPage.java | 0 13 files changed, 19 insertions(+), 16 deletions(-) delete mode 100644 org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs create mode 100644 org.argeo.eclipse.ui.rcp/bnd.bnd rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/DefaultNLS.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/FileHandler.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/FileProvider.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/GenericUploadControl.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/OpenFile.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/ThreadNLS.java (100%) rename org.argeo.eclipse.ui.rcp/src/{main/java => }/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java (100%) diff --git a/org.argeo.eclipse.ui.rcp/.classpath b/org.argeo.eclipse.ui.rcp/.classpath index 8cf7f48a0..d2953a684 100644 --- a/org.argeo.eclipse.ui.rcp/.classpath +++ b/org.argeo.eclipse.ui.rcp/.classpath @@ -1,7 +1,9 @@ - - - - + + + + diff --git a/org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs b/org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b06d92e45..000000000 --- a/org.argeo.eclipse.ui.rcp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Tue Mar 01 19:20:51 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.rcp/bnd.bnd b/org.argeo.eclipse.ui.rcp/bnd.bnd new file mode 100644 index 000000000..8e43cdfdf --- /dev/null +++ b/org.argeo.eclipse.ui.rcp/bnd.bnd @@ -0,0 +1,11 @@ +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.argeo.eclipse.ui.ArgeoUiPlugin +Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime +Import-Package: org.springframework.beans.factory,\ +org.springframework.core.io.support,\ +org.apache.commons.io,\ +org.argeo,\ +!org.eclipse.core.runtime,\ +!org.eclipse.core.commands,\ +!org.eclipse.ui.plugin,\ +* diff --git a/org.argeo.eclipse.ui.rcp/build.properties b/org.argeo.eclipse.ui.rcp/build.properties index 886a20027..fd806ca05 100644 --- a/org.argeo.eclipse.ui.rcp/build.properties +++ b/org.argeo.eclipse.ui.rcp/build.properties @@ -1,4 +1,2 @@ -source.. = src/main/java/ -output.. = target/classes/ -bin.includes = META-INF/,\ - .,\ +source.. = src/ +output.. = bin/ diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/DefaultNLS.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/DefaultNLS.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/DefaultNLS.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/DefaultNLS.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileHandler.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileHandler.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileProvider.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/FileProvider.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/GenericUploadControl.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/GenericUploadControl.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/OpenFile.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/OpenFile.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/OpenFile.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/ThreadNLS.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/ThreadNLS.java diff --git a/org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java b/org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java similarity index 100% rename from org.argeo.eclipse.ui.rcp/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java rename to org.argeo.eclipse.ui.rcp/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java -- 2.30.2