From 2e2528a96a4322544f9fc09e032c2ae816f9e753 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 14 Dec 2016 07:47:55 +0200 Subject: [PATCH] Restructured R repository for Tycho POMless builds. refs #6874 --- .gitignore | 6 + .gitreview | 2 + .mvn/extensions.xml | 8 + .../org.simantics.r.fileimport}/.classpath | 0 .../org.simantics.r.fileimport}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../OSGI-INF/component.xml | 0 .../simantics/r/fileimport/Activator.class | Bin .../simantics/r/fileimport/RFileImport.class | Bin .../build.properties | 0 .../org/simantics/r/fileimport/Activator.java | 0 .../simantics/r/fileimport/RFileImport.java | 0 .../org.simantics.r.ontology}/.classpath | 0 .../org.simantics.r.ontology}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../org.simantics.r.ontology}/graph.tg | Bin .../org.simantics.r.ontology}/graph/R.pgraph | 0 .../src/org/simantics/r/RResource.java | 0 .../org.simantics.r.scl}/.classpath | 0 .../org.simantics.r.scl}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.pde.core.prefs | 0 .../org.simantics.r.scl}/META-INF/MANIFEST.MF | 0 .../org.simantics.r.scl}/build.properties | 0 .../org.simantics.r.scl}/scl/R/R.md | 0 .../org.simantics.r.scl}/scl/R/R.scl | 0 .../org.simantics.r.scl}/scl/R/RExp.scl | 0 .../src/org/rosuda/REngine/LICENSE | 0 .../src/org/rosuda/REngine/MutableREXP.java | 0 .../src/org/rosuda/REngine/REXP.java | 0 .../src/org/rosuda/REngine/REXPDouble.java | 0 .../org/rosuda/REngine/REXPEnvironment.java | 0 .../rosuda/REngine/REXPExpressionVector.java | 0 .../src/org/rosuda/REngine/REXPFactor.java | 0 .../org/rosuda/REngine/REXPGenericVector.java | 0 .../src/org/rosuda/REngine/REXPInteger.java | 0 .../org/rosuda/REngine/REXPJavaReference.java | 0 .../src/org/rosuda/REngine/REXPLanguage.java | 0 .../src/org/rosuda/REngine/REXPList.java | 0 .../src/org/rosuda/REngine/REXPLogical.java | 0 .../rosuda/REngine/REXPMismatchException.java | 0 .../src/org/rosuda/REngine/REXPNull.java | 0 .../src/org/rosuda/REngine/REXPRaw.java | 0 .../src/org/rosuda/REngine/REXPReference.java | 0 .../src/org/rosuda/REngine/REXPS4.java | 0 .../src/org/rosuda/REngine/REXPString.java | 0 .../src/org/rosuda/REngine/REXPSymbol.java | 0 .../src/org/rosuda/REngine/REXPUnknown.java | 0 .../src/org/rosuda/REngine/REXPVector.java | 0 .../src/org/rosuda/REngine/REXPWrapper.java | 0 .../src/org/rosuda/REngine/REngine.java | 0 .../org/rosuda/REngine/REngineCallbacks.java | 0 .../REngineConsoleHistoryInterface.java | 0 .../rosuda/REngine/REngineEvalException.java | 0 .../org/rosuda/REngine/REngineException.java | 0 .../rosuda/REngine/REngineInputInterface.java | 0 .../REngine/REngineOutputInterface.java | 0 .../org/rosuda/REngine/REngineStdOutput.java | 0 .../rosuda/REngine/REngineUIInterface.java | 0 .../src/org/rosuda/REngine/RFactor.java | 0 .../src/org/rosuda/REngine/RList.java | 0 .../src/org/rosuda/REngine/Rserve/Makefile | 0 .../rosuda/REngine/Rserve/RConnection.java | 0 .../REngine/Rserve/RFileInputStream.java | 0 .../REngine/Rserve/RFileOutputStream.java | 0 .../org/rosuda/REngine/Rserve/RSession.java | 0 .../src/org/rosuda/REngine/Rserve/Rserve.jar | Bin .../REngine/Rserve/RserveException.java | 0 .../rosuda/REngine/Rserve/package-info.java | 0 .../REngine/Rserve/protocol/REXPFactory.java | 0 .../REngine/Rserve/protocol/RPacket.java | 0 .../rosuda/REngine/Rserve/protocol/RTalk.java | 0 .../REngine/Rserve/protocol/jcrypt.java | 0 .../src/org/rosuda/REngine/package-info.java | 0 .../src/org/simantics/r/scl/RSession.java | 0 .../r/scl/RSessionConfiguration.java | 0 .../org/simantics/r/scl/RSessionManager.java | 0 .../src/org/simantics/r/scl/TestRServe.java | 0 .../r/scl/variable/RAttributeNode.java | 0 .../r/scl/variable/RDataboardConversion.java | 0 .../r/scl/variable/RGlobalVariableNode.java | 0 .../r/scl/variable/RListItemNode.java | 0 .../r/scl/variable/RListLengthNode.java | 0 .../r/scl/variable/RNamedItemNode.java | 0 .../r/scl/variable/RNodeManager.java | 0 .../r/scl/variable/RVariableNode.java | 0 .../org.simantics.r}/.classpath | 0 .../org.simantics.r}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../org.simantics.r}/META-INF/MANIFEST.MF | 0 .../org.simantics.r}/adapters.xml | 0 .../org.simantics.r}/build.properties | 0 .../org.simantics.r}/scl/R/RConfiguration.md | 0 .../org.simantics.r}/scl/R/RConfiguration.scl | 0 .../scl/R/TestRConfiguration.scl | 0 .../src/org/simantics/r/RModelUtils.java | 0 .../src/org/simantics/r/RVariableBuilder.java | 0 bundles/pom.xml | 48 ++++ .../.credentials.properties | 0 .../org.simantics.r.build.feature}/.project | 0 .../buckminster.properties | 0 .../build.properties | 0 .../feature.xml | 0 .../org.simantics.r.build.feature}/notes.txt | 0 .../org.simantics.r.build.feature}/r.cquery | 0 .../org.simantics.r.build.feature}/r.rmap | 0 .../org.simantics.r.feature}/.project | 0 .../org.simantics.r.feature}/build.properties | 0 .../org.simantics.r.feature}/feature.xml | 0 .../sharedlibraries/RDB.sharedLibrary | Bin .../RStandardLibrary-1.2.sharedLibrary | Bin .../sharedlibraries/RUI.sharedLibrary | Bin features/pom.xml | 68 ++++++ pom.xml | 60 +++++ .../.project | 11 + ...ntics.sysdyn.build.targetdefinition.target | 227 ++++++++++++++++++ .../pom.xml | 16 ++ releng/org.simantics.r.repository/.gitignore | 1 + releng/org.simantics.r.repository/.project | 23 ++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../org.simantics.r.repository/category.xml | 11 + releng/org.simantics.r.repository/pom.xml | 72 ++++++ .../pom.xml | 70 ++++++ releng/pom.xml | 20 ++ 128 files changed, 649 insertions(+) create mode 100644 .gitignore create mode 100644 .gitreview create mode 100644 .mvn/extensions.xml rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/.classpath (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/.project (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/META-INF/MANIFEST.MF (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/OSGI-INF/component.xml (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/bin/org/simantics/r/fileimport/Activator.class (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/bin/org/simantics/r/fileimport/RFileImport.class (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/build.properties (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/src/org/simantics/r/fileimport/Activator.java (100%) rename {org.simantics.r.fileimport => bundles/org.simantics.r.fileimport}/src/org/simantics/r/fileimport/RFileImport.java (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/.classpath (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/.project (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/META-INF/MANIFEST.MF (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/build.properties (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/graph.tg (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/graph/R.pgraph (100%) rename {org.simantics.r.ontology => bundles/org.simantics.r.ontology}/src/org/simantics/r/RResource.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/.classpath (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/.project (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/.settings/org.eclipse.pde.core.prefs (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/META-INF/MANIFEST.MF (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/build.properties (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/scl/R/R.md (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/scl/R/R.scl (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/scl/R/RExp.scl (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/LICENSE (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/MutableREXP.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXP.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPDouble.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPEnvironment.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPExpressionVector.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPFactor.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPGenericVector.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPInteger.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPJavaReference.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPLanguage.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPList.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPLogical.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPMismatchException.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPNull.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPRaw.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPReference.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPS4.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPString.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPSymbol.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPUnknown.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPVector.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REXPWrapper.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngine.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineCallbacks.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineConsoleHistoryInterface.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineEvalException.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineException.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineInputInterface.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineOutputInterface.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineStdOutput.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/REngineUIInterface.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/RFactor.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/RList.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/Makefile (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/RConnection.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/RFileInputStream.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/RFileOutputStream.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/RSession.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/Rserve.jar (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/RserveException.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/package-info.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/protocol/REXPFactory.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/protocol/RPacket.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/protocol/RTalk.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/Rserve/protocol/jcrypt.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/rosuda/REngine/package-info.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/RSession.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/RSessionConfiguration.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/RSessionManager.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/TestRServe.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RAttributeNode.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RDataboardConversion.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RGlobalVariableNode.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RListItemNode.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RListLengthNode.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RNamedItemNode.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RNodeManager.java (100%) rename {org.simantics.r.scl => bundles/org.simantics.r.scl}/src/org/simantics/r/scl/variable/RVariableNode.java (100%) rename {org.simantics.r => bundles/org.simantics.r}/.classpath (100%) rename {org.simantics.r => bundles/org.simantics.r}/.project (100%) rename {org.simantics.r => bundles/org.simantics.r}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.simantics.r => bundles/org.simantics.r}/META-INF/MANIFEST.MF (100%) rename {org.simantics.r => bundles/org.simantics.r}/adapters.xml (100%) rename {org.simantics.r => bundles/org.simantics.r}/build.properties (100%) rename {org.simantics.r => bundles/org.simantics.r}/scl/R/RConfiguration.md (100%) rename {org.simantics.r => bundles/org.simantics.r}/scl/R/RConfiguration.scl (100%) rename {org.simantics.r => bundles/org.simantics.r}/scl/R/TestRConfiguration.scl (100%) rename {org.simantics.r => bundles/org.simantics.r}/src/org/simantics/r/RModelUtils.java (100%) rename {org.simantics.r => bundles/org.simantics.r}/src/org/simantics/r/RVariableBuilder.java (100%) create mode 100644 bundles/pom.xml rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/.credentials.properties (100%) rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/.project (100%) rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/buckminster.properties (100%) rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/build.properties (100%) rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/feature.xml (100%) rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/notes.txt (100%) rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/r.cquery (100%) rename {org.simantics.r.build.feature => features/org.simantics.r.build.feature}/r.rmap (100%) rename {org.simantics.r.feature => features/org.simantics.r.feature}/.project (100%) rename {org.simantics.r.feature => features/org.simantics.r.feature}/build.properties (100%) rename {org.simantics.r.feature => features/org.simantics.r.feature}/feature.xml (100%) rename {org.simantics.r.feature => features/org.simantics.r.feature}/rootfiles/sharedlibraries/RDB.sharedLibrary (100%) rename {org.simantics.r.feature => features/org.simantics.r.feature}/rootfiles/sharedlibraries/RStandardLibrary-1.2.sharedLibrary (100%) rename {org.simantics.r.feature => features/org.simantics.r.feature}/rootfiles/sharedlibraries/RUI.sharedLibrary (100%) create mode 100644 features/pom.xml create mode 100644 pom.xml create mode 100644 releng/org.simantics.r.build.targetdefinition/.project create mode 100644 releng/org.simantics.r.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target create mode 100644 releng/org.simantics.r.build.targetdefinition/pom.xml create mode 100644 releng/org.simantics.r.repository/.gitignore create mode 100644 releng/org.simantics.r.repository/.project create mode 100644 releng/org.simantics.r.repository/.settings/org.eclipse.core.resources.prefs create mode 100644 releng/org.simantics.r.repository/.settings/org.eclipse.m2e.core.prefs create mode 100644 releng/org.simantics.r.repository/category.xml create mode 100644 releng/org.simantics.r.repository/pom.xml create mode 100644 releng/org.simantics.r.tycho.configuration/pom.xml create mode 100644 releng/pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d61db6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +/**/bin/ +/features/*/target/ +/bundles/*/target/ +/releng/**/target/ +/tests/*/target/ +/**/.polyglot.build.properties diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..a69e25f --- /dev/null +++ b/.gitreview @@ -0,0 +1,2 @@ +[gerrit] +defaultremote = origin \ No newline at end of file diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..d0555d0 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + + org.eclipse.tycho.extras + tycho-pomless + 0.26.0 + + diff --git a/org.simantics.r.fileimport/.classpath b/bundles/org.simantics.r.fileimport/.classpath similarity index 100% rename from org.simantics.r.fileimport/.classpath rename to bundles/org.simantics.r.fileimport/.classpath diff --git a/org.simantics.r.fileimport/.project b/bundles/org.simantics.r.fileimport/.project similarity index 100% rename from org.simantics.r.fileimport/.project rename to bundles/org.simantics.r.fileimport/.project diff --git a/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs rename to bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs diff --git a/org.simantics.r.fileimport/META-INF/MANIFEST.MF b/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF similarity index 100% rename from org.simantics.r.fileimport/META-INF/MANIFEST.MF rename to bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF diff --git a/org.simantics.r.fileimport/OSGI-INF/component.xml b/bundles/org.simantics.r.fileimport/OSGI-INF/component.xml similarity index 100% rename from org.simantics.r.fileimport/OSGI-INF/component.xml rename to bundles/org.simantics.r.fileimport/OSGI-INF/component.xml diff --git a/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class b/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class similarity index 100% rename from org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class rename to bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class diff --git a/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class b/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class similarity index 100% rename from org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class rename to bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class diff --git a/org.simantics.r.fileimport/build.properties b/bundles/org.simantics.r.fileimport/build.properties similarity index 100% rename from org.simantics.r.fileimport/build.properties rename to bundles/org.simantics.r.fileimport/build.properties diff --git a/org.simantics.r.fileimport/src/org/simantics/r/fileimport/Activator.java b/bundles/org.simantics.r.fileimport/src/org/simantics/r/fileimport/Activator.java similarity index 100% rename from org.simantics.r.fileimport/src/org/simantics/r/fileimport/Activator.java rename to bundles/org.simantics.r.fileimport/src/org/simantics/r/fileimport/Activator.java diff --git a/org.simantics.r.fileimport/src/org/simantics/r/fileimport/RFileImport.java b/bundles/org.simantics.r.fileimport/src/org/simantics/r/fileimport/RFileImport.java similarity index 100% rename from org.simantics.r.fileimport/src/org/simantics/r/fileimport/RFileImport.java rename to bundles/org.simantics.r.fileimport/src/org/simantics/r/fileimport/RFileImport.java diff --git a/org.simantics.r.ontology/.classpath b/bundles/org.simantics.r.ontology/.classpath similarity index 100% rename from org.simantics.r.ontology/.classpath rename to bundles/org.simantics.r.ontology/.classpath diff --git a/org.simantics.r.ontology/.project b/bundles/org.simantics.r.ontology/.project similarity index 100% rename from org.simantics.r.ontology/.project rename to bundles/org.simantics.r.ontology/.project diff --git a/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs rename to bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs diff --git a/org.simantics.r.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF similarity index 100% rename from org.simantics.r.ontology/META-INF/MANIFEST.MF rename to bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF diff --git a/org.simantics.r.ontology/build.properties b/bundles/org.simantics.r.ontology/build.properties similarity index 100% rename from org.simantics.r.ontology/build.properties rename to bundles/org.simantics.r.ontology/build.properties diff --git a/org.simantics.r.ontology/graph.tg b/bundles/org.simantics.r.ontology/graph.tg similarity index 100% rename from org.simantics.r.ontology/graph.tg rename to bundles/org.simantics.r.ontology/graph.tg diff --git a/org.simantics.r.ontology/graph/R.pgraph b/bundles/org.simantics.r.ontology/graph/R.pgraph similarity index 100% rename from org.simantics.r.ontology/graph/R.pgraph rename to bundles/org.simantics.r.ontology/graph/R.pgraph diff --git a/org.simantics.r.ontology/src/org/simantics/r/RResource.java b/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java similarity index 100% rename from org.simantics.r.ontology/src/org/simantics/r/RResource.java rename to bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java diff --git a/org.simantics.r.scl/.classpath b/bundles/org.simantics.r.scl/.classpath similarity index 100% rename from org.simantics.r.scl/.classpath rename to bundles/org.simantics.r.scl/.classpath diff --git a/org.simantics.r.scl/.project b/bundles/org.simantics.r.scl/.project similarity index 100% rename from org.simantics.r.scl/.project rename to bundles/org.simantics.r.scl/.project diff --git a/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs rename to bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs diff --git a/org.simantics.r.scl/.settings/org.eclipse.pde.core.prefs b/bundles/org.simantics.r.scl/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from org.simantics.r.scl/.settings/org.eclipse.pde.core.prefs rename to bundles/org.simantics.r.scl/.settings/org.eclipse.pde.core.prefs diff --git a/org.simantics.r.scl/META-INF/MANIFEST.MF b/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF similarity index 100% rename from org.simantics.r.scl/META-INF/MANIFEST.MF rename to bundles/org.simantics.r.scl/META-INF/MANIFEST.MF diff --git a/org.simantics.r.scl/build.properties b/bundles/org.simantics.r.scl/build.properties similarity index 100% rename from org.simantics.r.scl/build.properties rename to bundles/org.simantics.r.scl/build.properties diff --git a/org.simantics.r.scl/scl/R/R.md b/bundles/org.simantics.r.scl/scl/R/R.md similarity index 100% rename from org.simantics.r.scl/scl/R/R.md rename to bundles/org.simantics.r.scl/scl/R/R.md diff --git a/org.simantics.r.scl/scl/R/R.scl b/bundles/org.simantics.r.scl/scl/R/R.scl similarity index 100% rename from org.simantics.r.scl/scl/R/R.scl rename to bundles/org.simantics.r.scl/scl/R/R.scl diff --git a/org.simantics.r.scl/scl/R/RExp.scl b/bundles/org.simantics.r.scl/scl/R/RExp.scl similarity index 100% rename from org.simantics.r.scl/scl/R/RExp.scl rename to bundles/org.simantics.r.scl/scl/R/RExp.scl diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/LICENSE b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/LICENSE similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/LICENSE rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/LICENSE diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/MutableREXP.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/MutableREXP.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/MutableREXP.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/MutableREXP.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXP.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXP.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXP.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXP.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPDouble.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPDouble.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPDouble.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPDouble.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPEnvironment.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPEnvironment.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPEnvironment.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPEnvironment.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPExpressionVector.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPExpressionVector.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPExpressionVector.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPExpressionVector.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPFactor.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPFactor.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPFactor.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPFactor.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPGenericVector.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPGenericVector.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPGenericVector.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPGenericVector.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPInteger.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPInteger.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPInteger.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPInteger.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPJavaReference.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPJavaReference.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPJavaReference.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPJavaReference.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPLanguage.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPLanguage.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPLanguage.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPLanguage.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPList.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPList.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPList.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPList.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPLogical.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPLogical.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPLogical.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPLogical.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPMismatchException.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPMismatchException.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPMismatchException.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPMismatchException.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPNull.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPNull.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPNull.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPNull.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPRaw.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPRaw.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPRaw.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPRaw.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPReference.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPReference.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPReference.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPReference.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPS4.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPS4.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPS4.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPS4.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPString.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPString.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPString.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPString.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPSymbol.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPSymbol.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPSymbol.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPSymbol.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPUnknown.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPUnknown.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPUnknown.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPUnknown.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPVector.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPVector.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPVector.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPVector.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REXPWrapper.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPWrapper.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REXPWrapper.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REXPWrapper.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngine.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngine.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngine.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngine.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineCallbacks.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineCallbacks.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineCallbacks.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineCallbacks.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineConsoleHistoryInterface.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineConsoleHistoryInterface.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineConsoleHistoryInterface.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineConsoleHistoryInterface.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineEvalException.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineEvalException.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineEvalException.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineEvalException.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineException.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineException.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineException.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineException.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineInputInterface.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineInputInterface.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineInputInterface.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineInputInterface.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineOutputInterface.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineOutputInterface.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineOutputInterface.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineOutputInterface.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineStdOutput.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineStdOutput.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineStdOutput.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineStdOutput.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/REngineUIInterface.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineUIInterface.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/REngineUIInterface.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/REngineUIInterface.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/RFactor.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/RFactor.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/RFactor.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/RFactor.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/RList.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/RList.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/RList.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/RList.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Makefile b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Makefile similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Makefile rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Makefile diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RConnection.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RConnection.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RConnection.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RConnection.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileInputStream.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileInputStream.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileInputStream.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileInputStream.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileOutputStream.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileOutputStream.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileOutputStream.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RFileOutputStream.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RSession.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RSession.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RSession.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RSession.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Rserve.jar b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Rserve.jar similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Rserve.jar rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/Rserve.jar diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RserveException.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RserveException.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RserveException.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/RserveException.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/package-info.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/package-info.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/package-info.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/package-info.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/REXPFactory.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/REXPFactory.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/REXPFactory.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/REXPFactory.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RPacket.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RPacket.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RPacket.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RPacket.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RTalk.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RTalk.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RTalk.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/RTalk.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/jcrypt.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/jcrypt.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/jcrypt.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/Rserve/protocol/jcrypt.java diff --git a/org.simantics.r.scl/src/org/rosuda/REngine/package-info.java b/bundles/org.simantics.r.scl/src/org/rosuda/REngine/package-info.java similarity index 100% rename from org.simantics.r.scl/src/org/rosuda/REngine/package-info.java rename to bundles/org.simantics.r.scl/src/org/rosuda/REngine/package-info.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/RSession.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/RSession.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/RSession.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/RSession.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/RSessionConfiguration.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/RSessionConfiguration.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/RSessionConfiguration.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/RSessionConfiguration.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/RSessionManager.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/RSessionManager.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/RSessionManager.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/RSessionManager.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/TestRServe.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/TestRServe.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/TestRServe.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/TestRServe.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RAttributeNode.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RAttributeNode.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RAttributeNode.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RAttributeNode.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RDataboardConversion.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RDataboardConversion.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RDataboardConversion.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RDataboardConversion.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RGlobalVariableNode.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RGlobalVariableNode.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RGlobalVariableNode.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RGlobalVariableNode.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RListItemNode.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RListItemNode.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RListItemNode.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RListItemNode.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RListLengthNode.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RListLengthNode.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RListLengthNode.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RListLengthNode.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RNamedItemNode.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RNamedItemNode.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RNamedItemNode.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RNamedItemNode.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RNodeManager.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RNodeManager.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RNodeManager.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RNodeManager.java diff --git a/org.simantics.r.scl/src/org/simantics/r/scl/variable/RVariableNode.java b/bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RVariableNode.java similarity index 100% rename from org.simantics.r.scl/src/org/simantics/r/scl/variable/RVariableNode.java rename to bundles/org.simantics.r.scl/src/org/simantics/r/scl/variable/RVariableNode.java diff --git a/org.simantics.r/.classpath b/bundles/org.simantics.r/.classpath similarity index 100% rename from org.simantics.r/.classpath rename to bundles/org.simantics.r/.classpath diff --git a/org.simantics.r/.project b/bundles/org.simantics.r/.project similarity index 100% rename from org.simantics.r/.project rename to bundles/org.simantics.r/.project diff --git a/org.simantics.r/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.simantics.r/.settings/org.eclipse.jdt.core.prefs rename to bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs diff --git a/org.simantics.r/META-INF/MANIFEST.MF b/bundles/org.simantics.r/META-INF/MANIFEST.MF similarity index 100% rename from org.simantics.r/META-INF/MANIFEST.MF rename to bundles/org.simantics.r/META-INF/MANIFEST.MF diff --git a/org.simantics.r/adapters.xml b/bundles/org.simantics.r/adapters.xml similarity index 100% rename from org.simantics.r/adapters.xml rename to bundles/org.simantics.r/adapters.xml diff --git a/org.simantics.r/build.properties b/bundles/org.simantics.r/build.properties similarity index 100% rename from org.simantics.r/build.properties rename to bundles/org.simantics.r/build.properties diff --git a/org.simantics.r/scl/R/RConfiguration.md b/bundles/org.simantics.r/scl/R/RConfiguration.md similarity index 100% rename from org.simantics.r/scl/R/RConfiguration.md rename to bundles/org.simantics.r/scl/R/RConfiguration.md diff --git a/org.simantics.r/scl/R/RConfiguration.scl b/bundles/org.simantics.r/scl/R/RConfiguration.scl similarity index 100% rename from org.simantics.r/scl/R/RConfiguration.scl rename to bundles/org.simantics.r/scl/R/RConfiguration.scl diff --git a/org.simantics.r/scl/R/TestRConfiguration.scl b/bundles/org.simantics.r/scl/R/TestRConfiguration.scl similarity index 100% rename from org.simantics.r/scl/R/TestRConfiguration.scl rename to bundles/org.simantics.r/scl/R/TestRConfiguration.scl diff --git a/org.simantics.r/src/org/simantics/r/RModelUtils.java b/bundles/org.simantics.r/src/org/simantics/r/RModelUtils.java similarity index 100% rename from org.simantics.r/src/org/simantics/r/RModelUtils.java rename to bundles/org.simantics.r/src/org/simantics/r/RModelUtils.java diff --git a/org.simantics.r/src/org/simantics/r/RVariableBuilder.java b/bundles/org.simantics.r/src/org/simantics/r/RVariableBuilder.java similarity index 100% rename from org.simantics.r/src/org/simantics/r/RVariableBuilder.java rename to bundles/org.simantics.r/src/org/simantics/r/RVariableBuilder.java diff --git a/bundles/pom.xml b/bundles/pom.xml new file mode 100644 index 0000000..2d6f6a5 --- /dev/null +++ b/bundles/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + org.simantics + org.simantics.r.root.bundles + 1.0.0-SNAPSHOT + pom + + + org.simantics + org.simantics.r.root + 1.0.0-SNAPSHOT + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + -err:-forbidden + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + + + + + + org.simantics.r + org.simantics.r.fileimport + org.simantics.r.ontology + org.simantics.r.scl + + diff --git a/org.simantics.r.build.feature/.credentials.properties b/features/org.simantics.r.build.feature/.credentials.properties similarity index 100% rename from org.simantics.r.build.feature/.credentials.properties rename to features/org.simantics.r.build.feature/.credentials.properties diff --git a/org.simantics.r.build.feature/.project b/features/org.simantics.r.build.feature/.project similarity index 100% rename from org.simantics.r.build.feature/.project rename to features/org.simantics.r.build.feature/.project diff --git a/org.simantics.r.build.feature/buckminster.properties b/features/org.simantics.r.build.feature/buckminster.properties similarity index 100% rename from org.simantics.r.build.feature/buckminster.properties rename to features/org.simantics.r.build.feature/buckminster.properties diff --git a/org.simantics.r.build.feature/build.properties b/features/org.simantics.r.build.feature/build.properties similarity index 100% rename from org.simantics.r.build.feature/build.properties rename to features/org.simantics.r.build.feature/build.properties diff --git a/org.simantics.r.build.feature/feature.xml b/features/org.simantics.r.build.feature/feature.xml similarity index 100% rename from org.simantics.r.build.feature/feature.xml rename to features/org.simantics.r.build.feature/feature.xml diff --git a/org.simantics.r.build.feature/notes.txt b/features/org.simantics.r.build.feature/notes.txt similarity index 100% rename from org.simantics.r.build.feature/notes.txt rename to features/org.simantics.r.build.feature/notes.txt diff --git a/org.simantics.r.build.feature/r.cquery b/features/org.simantics.r.build.feature/r.cquery similarity index 100% rename from org.simantics.r.build.feature/r.cquery rename to features/org.simantics.r.build.feature/r.cquery diff --git a/org.simantics.r.build.feature/r.rmap b/features/org.simantics.r.build.feature/r.rmap similarity index 100% rename from org.simantics.r.build.feature/r.rmap rename to features/org.simantics.r.build.feature/r.rmap diff --git a/org.simantics.r.feature/.project b/features/org.simantics.r.feature/.project similarity index 100% rename from org.simantics.r.feature/.project rename to features/org.simantics.r.feature/.project diff --git a/org.simantics.r.feature/build.properties b/features/org.simantics.r.feature/build.properties similarity index 100% rename from org.simantics.r.feature/build.properties rename to features/org.simantics.r.feature/build.properties diff --git a/org.simantics.r.feature/feature.xml b/features/org.simantics.r.feature/feature.xml similarity index 100% rename from org.simantics.r.feature/feature.xml rename to features/org.simantics.r.feature/feature.xml diff --git a/org.simantics.r.feature/rootfiles/sharedlibraries/RDB.sharedLibrary b/features/org.simantics.r.feature/rootfiles/sharedlibraries/RDB.sharedLibrary similarity index 100% rename from org.simantics.r.feature/rootfiles/sharedlibraries/RDB.sharedLibrary rename to features/org.simantics.r.feature/rootfiles/sharedlibraries/RDB.sharedLibrary diff --git a/org.simantics.r.feature/rootfiles/sharedlibraries/RStandardLibrary-1.2.sharedLibrary b/features/org.simantics.r.feature/rootfiles/sharedlibraries/RStandardLibrary-1.2.sharedLibrary similarity index 100% rename from org.simantics.r.feature/rootfiles/sharedlibraries/RStandardLibrary-1.2.sharedLibrary rename to features/org.simantics.r.feature/rootfiles/sharedlibraries/RStandardLibrary-1.2.sharedLibrary diff --git a/org.simantics.r.feature/rootfiles/sharedlibraries/RUI.sharedLibrary b/features/org.simantics.r.feature/rootfiles/sharedlibraries/RUI.sharedLibrary similarity index 100% rename from org.simantics.r.feature/rootfiles/sharedlibraries/RUI.sharedLibrary rename to features/org.simantics.r.feature/rootfiles/sharedlibraries/RUI.sharedLibrary diff --git a/features/pom.xml b/features/pom.xml new file mode 100644 index 0000000..7eebcef --- /dev/null +++ b/features/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + org.simantics + org.simantics.r.root.features + 1.0.0-SNAPSHOT + pom + + + org.simantics + org.simantics.r.root + 1.0.0-SNAPSHOT + + + + + + org.eclipse.tycho.extras + tycho-source-feature-plugin + ${tycho.extras.version} + + + source-feature + package + + source-feature + + + + + + + + + + + + + + + + + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + + attach-p2-metadata + package + + p2-metadata + + + + + + + + + org.simantics.r.feature + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..bd939f1 --- /dev/null +++ b/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + org.simantics + org.simantics.r.root + 1.0.0-SNAPSHOT + pom + + org.simantics + org.simantics.r.tycho.configuration + 1.0.0-SNAPSHOT + releng/org.simantics.r.tycho.configuration + + + + bundles + features + releng + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-clean-plugin + + + [2.5,) + + + clean + + + + + + + + + + + + + + diff --git a/releng/org.simantics.r.build.targetdefinition/.project b/releng/org.simantics.r.build.targetdefinition/.project new file mode 100644 index 0000000..a9f7458 --- /dev/null +++ b/releng/org.simantics.r.build.targetdefinition/.project @@ -0,0 +1,11 @@ + + + org.simantics.r.build.targetdefinition + + + + + + + + diff --git a/releng/org.simantics.r.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target b/releng/org.simantics.r.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target new file mode 100644 index 0000000..b22abf0 --- /dev/null +++ b/releng/org.simantics.r.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.r.build.targetdefinition/pom.xml b/releng/org.simantics.r.build.targetdefinition/pom.xml new file mode 100644 index 0000000..75cc11c --- /dev/null +++ b/releng/org.simantics.r.build.targetdefinition/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + org.simantics + org.simantics.r.build.targetdefinition + 1.0.0-SNAPSHOT + eclipse-target-definition + + + org.simantics + org.simantics.r.root.releng + 1.0.0-SNAPSHOT + + diff --git a/releng/org.simantics.r.repository/.gitignore b/releng/org.simantics.r.repository/.gitignore new file mode 100644 index 0000000..c4130ba --- /dev/null +++ b/releng/org.simantics.r.repository/.gitignore @@ -0,0 +1 @@ +/target/** diff --git a/releng/org.simantics.r.repository/.project b/releng/org.simantics.r.repository/.project new file mode 100644 index 0000000..30b0ed6 --- /dev/null +++ b/releng/org.simantics.r.repository/.project @@ -0,0 +1,23 @@ + + + org.simantics.r.repository + + + + + + org.eclipse.pde.UpdateSiteBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.UpdateSiteNature + + diff --git a/releng/org.simantics.r.repository/.settings/org.eclipse.core.resources.prefs b/releng/org.simantics.r.repository/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..4824b80 --- /dev/null +++ b/releng/org.simantics.r.repository/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/releng/org.simantics.r.repository/.settings/org.eclipse.m2e.core.prefs b/releng/org.simantics.r.repository/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..14b697b --- /dev/null +++ b/releng/org.simantics.r.repository/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/releng/org.simantics.r.repository/category.xml b/releng/org.simantics.r.repository/category.xml new file mode 100644 index 0000000..c333994 --- /dev/null +++ b/releng/org.simantics.r.repository/category.xml @@ -0,0 +1,11 @@ + + + + + + + + This is the P2 repository for Simantics R Components + + + diff --git a/releng/org.simantics.r.repository/pom.xml b/releng/org.simantics.r.repository/pom.xml new file mode 100644 index 0000000..bf5e29d --- /dev/null +++ b/releng/org.simantics.r.repository/pom.xml @@ -0,0 +1,72 @@ + + 4.0.0 + org.simantics.r.repository + 1.10.0-SNAPSHOT + eclipse-repository + + + org.simantics + org.simantics.r.root.releng + 1.0.0-SNAPSHOT + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-clean-plugin + + + [2.5,) + + + clean + + + + + + + + + + org.eclipse.tycho + + + tycho-packaging-plugin + + + [0.26.0,) + + + + build-qualifier-aggregator + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.r.tycho.configuration/pom.xml b/releng/org.simantics.r.tycho.configuration/pom.xml new file mode 100644 index 0000000..f2d8461 --- /dev/null +++ b/releng/org.simantics.r.tycho.configuration/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + org.simantics + org.simantics.r.tycho.configuration + 1.0.0-SNAPSHOT + pom + + + 0.26.0 + 0.26.0 + UTF-8 + + + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + + org.simantics + org.simantics.r.build.targetdefinition + 1.0.0-SNAPSHOT + + + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + + + + + diff --git a/releng/pom.xml b/releng/pom.xml new file mode 100644 index 0000000..e548ced --- /dev/null +++ b/releng/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + org.simantics + org.simantics.r.root.releng + 1.0.0-SNAPSHOT + pom + + + org.simantics + org.simantics.r.root + 1.0.0-SNAPSHOT + + + + org.simantics.r.build.targetdefinition + org.simantics.r.repository + + -- 2.47.1