From 66fb5872ade1db9ea79f072bbb22ed5dcb62f17f Mon Sep 17 00:00:00 2001
From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 1 Apr 2016 07:24:20 +0000
Subject: [PATCH] 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
---
 org.simantics.fmil.feature/.project           |  6 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 +++
 org.simantics.fmil.feature/feature.xml        |  2 +-
 org.simantics.fmil.feature/pom.xml            | 16 +++++++++
 org.simantics.fmil.win32/.project             |  6 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 +++
 org.simantics.fmil.win32/META-INF/MANIFEST.MF |  4 +--
 org.simantics.fmil.win32/pom.xml              | 35 +++++++++++++++++++
 org.simantics.fmil.win64/.project             |  6 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 +++
 org.simantics.fmil.win64/META-INF/MANIFEST.MF |  4 +--
 org.simantics.fmil.win64/pom.xml              | 35 +++++++++++++++++++
 org.simantics.fmil/.project                   |  8 ++++-
 .../.settings/org.eclipse.m2e.core.prefs      |  4 +++
 org.simantics.fmil/META-INF/MANIFEST.MF       |  4 +--
 org.simantics.fmil/pom.xml                    | 18 ++++++++++
 .../fmil/{ => core}/ExecEnvironment.java      |  2 +-
 .../org/simantics/fmil/{ => core}/FMIL.java   |  6 ++--
 .../fmil/{ => core}/FMILException.java        |  2 +-
 19 files changed, 157 insertions(+), 13 deletions(-)
 create mode 100644 org.simantics.fmil.feature/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 org.simantics.fmil.feature/pom.xml
 create mode 100644 org.simantics.fmil.win32/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 org.simantics.fmil.win32/pom.xml
 create mode 100644 org.simantics.fmil.win64/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 org.simantics.fmil.win64/pom.xml
 create mode 100644 org.simantics.fmil/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 org.simantics.fmil/pom.xml
 rename org.simantics.fmil/src/org/simantics/fmil/{ => core}/ExecEnvironment.java (94%)
 rename org.simantics.fmil/src/org/simantics/fmil/{ => core}/FMIL.java (96%)
 rename org.simantics.fmil/src/org/simantics/fmil/{ => core}/FMILException.java (88%)

diff --git a/org.simantics.fmil.feature/.project b/org.simantics.fmil.feature/.project
index 8e73691..ea930fd 100644
--- a/org.simantics.fmil.feature/.project
+++ b/org.simantics.fmil.feature/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
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
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.simantics.fmil.feature/feature.xml b/org.simantics.fmil.feature/feature.xml
index 3223c04..5ca6234 100644
--- a/org.simantics.fmil.feature/feature.xml
+++ b/org.simantics.fmil.feature/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <plugin
-         id="org.simantics.fmil"
+         id="org.simantics.fmil.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.simantics.fmil.feature/pom.xml b/org.simantics.fmil.feature/pom.xml
new file mode 100644
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"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.simantics.fmi</groupId>
+		<artifactId>org.simantics.fmil.parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../org.simantics.fmil.parent</relativePath>
+	</parent>
+
+	<artifactId>org.simantics.fmil</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+
+</project>
\ No newline at end of file
diff --git a/org.simantics.fmil.win32/.project b/org.simantics.fmil.win32/.project
index 5b90224..f4ff0ca 100644
--- a/org.simantics.fmil.win32/.project
+++ b/org.simantics.fmil.win32/.project
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
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
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil.win32/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.simantics.fmil.win32/META-INF/MANIFEST.MF b/org.simantics.fmil.win32/META-INF/MANIFEST.MF
index 5b5d44f..7e6e9a8 100644
--- 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
index 0000000..c674fd9
--- /dev/null
+++ b/org.simantics.fmil.win32/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.simantics.fmi</groupId>
+		<artifactId>org.simantics.fmil.parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../org.simantics.fmil.parent</relativePath>
+	</parent>
+
+	<artifactId>org.simantics.fmil.win32</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<environments>
+						<environment>
+							<os>win32</os>
+							<arch>x86</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/org.simantics.fmil.win64/.project b/org.simantics.fmil.win64/.project
index f68bf19..87c8ad1 100644
--- a/org.simantics.fmil.win64/.project
+++ b/org.simantics.fmil.win64/.project
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
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
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil.win64/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.simantics.fmil.win64/META-INF/MANIFEST.MF b/org.simantics.fmil.win64/META-INF/MANIFEST.MF
index 4ff463b..361c90e 100644
--- 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
index 0000000..966fe33
--- /dev/null
+++ b/org.simantics.fmil.win64/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.simantics.fmi</groupId>
+		<artifactId>org.simantics.fmil.parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../org.simantics.fmil.parent</relativePath>
+	</parent>
+
+	<artifactId>org.simantics.fmil.win64</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<environments>
+						<environment>
+							<os>win32</os>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/org.simantics.fmil/.project b/org.simantics.fmil/.project
index ea9d9e9..de0fa03 100644
--- a/org.simantics.fmil/.project
+++ b/org.simantics.fmil/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.simantics.fmil</name>
+	<name>org.simantics.fmil.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
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
index 0000000..14b697b
--- /dev/null
+++ b/org.simantics.fmil/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.simantics.fmil/META-INF/MANIFEST.MF b/org.simantics.fmil/META-INF/MANIFEST.MF
index c39bba3..e5b5fa2 100644
--- 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
index 0000000..5495dfb
--- /dev/null
+++ b/org.simantics.fmil/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.simantics.fmi</groupId>
+		<artifactId>org.simantics.fmil.parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../org.simantics.fmil.parent</relativePath>
+	</parent>
+
+	<artifactId>org.simantics.fmil.core</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+
+</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 ef2ba63..306825b 100644
--- 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;
+package org.simantics.fmil.core;
 
 public class ExecEnvironment {
 
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 39b90b1..5c00607 100644
--- 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;
+package org.simantics.fmil.core;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,8 +15,8 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 import org.simantics.Simantics;
-import org.simantics.fmil.ExecEnvironment.ARCHType;
-import org.simantics.fmil.ExecEnvironment.OSType;
+import org.simantics.fmil.core.ExecEnvironment.ARCHType;
+import org.simantics.fmil.core.ExecEnvironment.OSType;
 import org.simantics.utils.FileUtils;
 
 import gnu.trove.list.array.TIntArrayList;
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 5b6f06f..a6945d0 100644
--- 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;
+package org.simantics.fmil.core;
 
 /**
  * Exception thrown when native fmu calls fail
-- 
2.45.2