Mavenized FMIL projects.

Renamed org.simantics.fmil to org.simantics.fmil.core to not have a bundle and a feature with the same ID.

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32634 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.fmil.feature/.project b/org.simantics.fmil.feature/.project
index 8e7369175caa5ffd9881dde2c8cffff5ebd1915a..ea930fd342f0bbedd8b1f3088bd03a049f14a6ba 100644 (file)
--- a/org.simantics.fmil.feature/.project
+++ b/org.simantics.fmil.feature/.project
@@ -10,8 +10,14 @@
                        <arguments>\r
                        </arguments>\r
                </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.m2e.core.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
        </buildSpec>\r
        <natures>\r
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
                <nature>org.eclipse.pde.FeatureNature</nature>\r
        </natures>\r
 </projectDescription>\r

diff --git a/org.simantics.fmil.feature/.settings/org.eclipse.m2e.core.prefs b/org.simantics.fmil.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644 (file)
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=\r
+eclipse.preferences.version=1\r
+resolveWorkspaceProjects=true\r
+version=1\r

diff --git a/org.simantics.fmil.feature/feature.xml b/org.simantics.fmil.feature/feature.xml
index 3223c04f125de9e92973bdd0cc6aea90a0f6f925..5ca62342ad90eff8a5657bddcbd8b83f2b16e403 100644 (file)
--- a/org.simantics.fmil.feature/feature.xml
+++ b/org.simantics.fmil.feature/feature.xml
@@ -18,7 +18,7 @@
    </license>\r
 \r
    <plugin\r
-         id="org.simantics.fmil"\r
+         id="org.simantics.fmil.core"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r

diff --git a/org.simantics.fmil.feature/pom.xml b/org.simantics.fmil.feature/pom.xml
new file mode 100644 (file)
index 0000000..778ef50
--- /dev/null
+++ b/org.simantics.fmil.feature/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+       <modelVersion>4.0.0</modelVersion>\r
+\r
+       <parent>\r
+               <groupId>org.simantics.fmi</groupId>\r
+               <artifactId>org.simantics.fmil.parent</artifactId>\r
+               <version>0.0.1-SNAPSHOT</version>\r
+               <relativePath>../org.simantics.fmil.parent</relativePath>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.fmil</artifactId>\r
+       <packaging>eclipse-feature</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+</project>
\ No newline at end of file

diff --git a/org.simantics.fmil.win32/.project b/org.simantics.fmil.win32/.project
index 5b90224cd2d857ca045d1b3b5e3d354f7edaf745..f4ff0ca7280170079730a96bd07cd2aad93c4910 100644 (file)
--- a/org.simantics.fmil.win32/.project
+++ b/org.simantics.fmil.win32/.project
@@ -20,8 +20,14 @@
                        <arguments>\r
                        </arguments>\r
                </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.m2e.core.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
        </buildSpec>\r
        <natures>\r
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
                <nature>org.eclipse.pde.PluginNature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
        </natures>\r

diff --git a/org.simantics.fmil.win32/.settings/org.eclipse.m2e.core.prefs b/org.simantics.fmil.win32/.settings/org.eclipse.m2e.core.prefs
new file mode 100644 (file)
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil.win32/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=\r
+eclipse.preferences.version=1\r
+resolveWorkspaceProjects=true\r
+version=1\r

diff --git a/org.simantics.fmil.win32/META-INF/MANIFEST.MF b/org.simantics.fmil.win32/META-INF/MANIFEST.MF
index 5b5d44f47a7401719db1ceee91b3c376376b840d..7e6e9a855fb62330815ac9d7a5db3d11089928ff 100644 (file)
--- a/org.simantics.fmil.win32/META-INF/MANIFEST.MF
+++ b/org.simantics.fmil.win32/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: FMI Library 32-bit Windows Fragment
 Bundle-SymbolicName: org.simantics.fmil.win32
 Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.simantics.fmil
+Fragment-Host: org.simantics.fmil.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))
+Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
 Bundle-Vendor: Semantum Oy

diff --git a/org.simantics.fmil.win32/pom.xml b/org.simantics.fmil.win32/pom.xml
new file mode 100644 (file)
index 0000000..c674fd9
--- /dev/null
+++ b/org.simantics.fmil.win32/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"\r
+       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+       <modelVersion>4.0.0</modelVersion>\r
+\r
+       <parent>\r
+               <groupId>org.simantics.fmi</groupId>\r
+               <artifactId>org.simantics.fmil.parent</artifactId>\r
+               <version>0.0.1-SNAPSHOT</version>\r
+               <relativePath>../org.simantics.fmil.parent</relativePath>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.fmil.win32</artifactId>\r
+       <packaging>eclipse-plugin</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>target-platform-configuration</artifactId>\r
+                               <configuration>\r
+                                       <environments>\r
+                                               <environment>\r
+                                                       <os>win32</os>\r
+                                                       <arch>x86</arch>\r
+                                               </environment>\r
+                                       </environments>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
+\r
+</project>
\ No newline at end of file

diff --git a/org.simantics.fmil.win64/.project b/org.simantics.fmil.win64/.project
index f68bf191116beb7a091680c593a8c26001c43817..87c8ad1c0f8dc2c0a95309713ab22b776d94999c 100644 (file)
--- a/org.simantics.fmil.win64/.project
+++ b/org.simantics.fmil.win64/.project
@@ -20,8 +20,14 @@
                        <arguments>\r
                        </arguments>\r
                </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.m2e.core.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
        </buildSpec>\r
        <natures>\r
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
                <nature>org.eclipse.pde.PluginNature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
        </natures>\r

diff --git a/org.simantics.fmil.win64/.settings/org.eclipse.m2e.core.prefs b/org.simantics.fmil.win64/.settings/org.eclipse.m2e.core.prefs
new file mode 100644 (file)
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil.win64/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=\r
+eclipse.preferences.version=1\r
+resolveWorkspaceProjects=true\r
+version=1\r

diff --git a/org.simantics.fmil.win64/META-INF/MANIFEST.MF b/org.simantics.fmil.win64/META-INF/MANIFEST.MF
index 4ff463b2c481e6191392caf29bafc151716fc51d..361c90e0a233703b69db5b147ead347bd4b72432 100644 (file)
--- a/org.simantics.fmil.win64/META-INF/MANIFEST.MF
+++ b/org.simantics.fmil.win64/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: FMI Library 64-bit Windows Fragment
 Bundle-SymbolicName: org.simantics.fmil.win64
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Semantum Oy
-Fragment-Host: org.simantics.fmil;bundle-version="1.0.0"
+Fragment-Host: org.simantics.fmil.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))
+Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))

diff --git a/org.simantics.fmil.win64/pom.xml b/org.simantics.fmil.win64/pom.xml
new file mode 100644 (file)
index 0000000..966fe33
--- /dev/null
+++ b/org.simantics.fmil.win64/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"\r
+       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+       <modelVersion>4.0.0</modelVersion>\r
+\r
+       <parent>\r
+               <groupId>org.simantics.fmi</groupId>\r
+               <artifactId>org.simantics.fmil.parent</artifactId>\r
+               <version>0.0.1-SNAPSHOT</version>\r
+               <relativePath>../org.simantics.fmil.parent</relativePath>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.fmil.win64</artifactId>\r
+       <packaging>eclipse-plugin</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>target-platform-configuration</artifactId>\r
+                               <configuration>\r
+                                       <environments>\r
+                                               <environment>\r
+                                                       <os>win32</os>\r
+                                                       <arch>x86_64</arch>\r
+                                               </environment>\r
+                                       </environments>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
+\r
+</project>
\ No newline at end of file

diff --git a/org.simantics.fmil/.project b/org.simantics.fmil/.project
index ea9d9e91f3f378683a40164a14d60729e176e3bc..de0fa03c6a98540d8aae7d53b2551ba8ed5c9e30 100644 (file)
--- a/org.simantics.fmil/.project
+++ b/org.simantics.fmil/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>org.simantics.fmil</name>\r
+       <name>org.simantics.fmil.core</name>\r
        <comment></comment>\r
        <projects>\r
        </projects>\r
@@ -20,8 +20,14 @@
                        <arguments>\r
                        </arguments>\r
                </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.m2e.core.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
        </buildSpec>\r
        <natures>\r
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
                <nature>org.eclipse.pde.PluginNature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
        </natures>\r

diff --git a/org.simantics.fmil/.settings/org.eclipse.m2e.core.prefs b/org.simantics.fmil/.settings/org.eclipse.m2e.core.prefs
new file mode 100644 (file)
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=\r
+eclipse.preferences.version=1\r
+resolveWorkspaceProjects=true\r
+version=1\r

diff --git a/org.simantics.fmil/META-INF/MANIFEST.MF b/org.simantics.fmil/META-INF/MANIFEST.MF
index c39bba33a1e158c237ff4617bbc71e628735c269..e5b5fa24a6f04e5f5b3e0da07f6c9d76d52b3dbc 100644 (file)
--- a/org.simantics.fmil/META-INF/MANIFEST.MF
+++ b/org.simantics.fmil/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: FMI Library
-Bundle-SymbolicName: org.simantics.fmil
+Bundle-SymbolicName: org.simantics.fmil.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Semantum Oy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.simantics.utils;bundle-version="1.1.0",
  org.simantics;bundle-version="1.0.0"
-Export-Package: org.simantics.fmil
+Export-Package: org.simantics.fmil.core

diff --git a/org.simantics.fmil/pom.xml b/org.simantics.fmil/pom.xml
new file mode 100644 (file)
index 0000000..5495dfb
--- /dev/null
+++ b/org.simantics.fmil/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"\r
+       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+       <modelVersion>4.0.0</modelVersion>\r
+\r
+       <parent>\r
+               <groupId>org.simantics.fmi</groupId>\r
+               <artifactId>org.simantics.fmil.parent</artifactId>\r
+               <version>0.0.1-SNAPSHOT</version>\r
+               <relativePath>../org.simantics.fmil.parent</relativePath>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.fmil.core</artifactId>\r
+       <packaging>eclipse-plugin</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+</project>
\ No newline at end of file

diff --git a/org.simantics.fmil/src/org/simantics/fmil/ExecEnvironment.java b/org.simantics.fmil/src/org/simantics/fmil/core/ExecEnvironment.java
similarity index 94%
rename from org.simantics.fmil/src/org/simantics/fmil/ExecEnvironment.java
rename to org.simantics.fmil/src/org/simantics/fmil/core/ExecEnvironment.java
index ef2ba6355de3b25ea0e5db8e6e4b51d8f10984ed..306825bbd0e1a9ed7bb4bf4c5a089289cc01f57b 100644 (file)
--- a/org.simantics.fmil/src/org/simantics/fmil/ExecEnvironment.java
+++ b/org.simantics.fmil/src/org/simantics/fmil/core/ExecEnvironment.java
@@ -1,4 +1,4 @@
-package org.simantics.fmil;\r
+package org.simantics.fmil.core;\r
 \r
 public class ExecEnvironment {\r
 \r

diff --git a/org.simantics.fmil/src/org/simantics/fmil/FMIL.java b/org.simantics.fmil/src/org/simantics/fmil/core/FMIL.java
similarity index 96%
rename from org.simantics.fmil/src/org/simantics/fmil/FMIL.java
rename to org.simantics.fmil/src/org/simantics/fmil/core/FMIL.java
index 39b90b1d0e0b474d1a57b0729deda3cf5341b529..5c00607b9be349d4a03401a27397cb99cc97d9da 100644 (file)
--- a/org.simantics.fmil/src/org/simantics/fmil/FMIL.java
+++ b/org.simantics.fmil/src/org/simantics/fmil/core/FMIL.java
@@ -1,4 +1,4 @@
-package org.simantics.fmil;\r
+package org.simantics.fmil.core;\r
 \r
 import java.io.File;\r
 import java.io.IOException;\r
@@ -15,8 +15,8 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;\r
 import org.osgi.framework.Bundle;\r
 import org.simantics.Simantics;\r
-import org.simantics.fmil.ExecEnvironment.ARCHType;\r
-import org.simantics.fmil.ExecEnvironment.OSType;\r
+import org.simantics.fmil.core.ExecEnvironment.ARCHType;\r
+import org.simantics.fmil.core.ExecEnvironment.OSType;\r
 import org.simantics.utils.FileUtils;\r
 \r
 import gnu.trove.list.array.TIntArrayList;\r

diff --git a/org.simantics.fmil/src/org/simantics/fmil/FMILException.java b/org.simantics.fmil/src/org/simantics/fmil/core/FMILException.java
similarity index 88%
rename from org.simantics.fmil/src/org/simantics/fmil/FMILException.java
rename to org.simantics.fmil/src/org/simantics/fmil/core/FMILException.java
index 5b6f06f2694379315397479db4ff982f0b8dc3a4..a6945d0433bb986771054a9da3199d0fecb56801 100644 (file)
--- a/org.simantics.fmil/src/org/simantics/fmil/FMILException.java
+++ b/org.simantics.fmil/src/org/simantics/fmil/core/FMILException.java
@@ -1,4 +1,4 @@
-package org.simantics.fmil;\r
+package org.simantics.fmil.core;\r
 \r
 /**\r
  * Exception thrown when native fmu calls fail\r