Maven pom.xml files for plant3d projects

Also added org.simantics.plant3d.product.repository for building plant3d
test product.

Change-Id: I511a896bde58e25403ad6fec6d855b98822cd29c

diff --git a/org.simantics.plant3d.modeling.feature/feature.xml b/org.simantics.plant3d.modeling.feature/feature.xml
index 96f2034f115aaaf885fcc094a71968d3af0f91f5..7c5588e2d6c92bb10a664369f1290170029ebb5a 100644 (file)
--- a/org.simantics.plant3d.modeling.feature/feature.xml
+++ b/org.simantics.plant3d.modeling.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.simantics.plant3d.modeling"
+      id="org.simantics.plant3d.modeling.feature"
       label="Plant3D Feature"
       version="1.0.0.qualifier"
       provider-name="VTT">

diff --git a/org.simantics.plant3d.modeling.feature/pom.xml b/org.simantics.plant3d.modeling.feature/pom.xml
new file mode 100644 (file)
index 0000000..d39edcc
--- /dev/null
+++ b/org.simantics.plant3d.modeling.feature/pom.xml
@@ -0,0 +1,15 @@
+<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.g3d</groupId>\r
+               <artifactId>org.simantics.g3d.root</artifactId>\r
+               <version>1.0.0-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.plant3d.modeling.feature</artifactId>\r
+       <packaging>eclipse-feature</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+</project>\r

diff --git a/org.simantics.plant3d.ontology/pom.xml b/org.simantics.plant3d.ontology/pom.xml
new file mode 100644 (file)
index 0000000..cfef1e6
--- /dev/null
+++ b/org.simantics.plant3d.ontology/pom.xml
@@ -0,0 +1,17 @@
+<?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.g3d</groupId>\r
+               <artifactId>org.simantics.g3d.root</artifactId>\r
+               <version>1.0.0-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.plant3d.ontology</artifactId>\r
+       <packaging>eclipse-plugin</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+</project>\r

diff --git a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
index 3e430365d3327283b422b4d9a27f5b923b8606da..817c94758fd61cd2bc89ebed997a1d904128b7e5 100644 (file)
--- a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
+++ b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
@@ -56,16 +56,14 @@ public class Plant3D {
     public final Resource HasBranch7;
     public final Resource HasBranch8;
     public final Resource HasBranch9;
+    public final Resource HasFixedNozzles;
+    public final Resource HasFixedNozzles_Inverse;
     public final Resource HasLength;
     public final Resource HasLength_Inverse;
     public final Resource HasNext;
     public final Resource HasNozzle;
-    public final Resource HasNozzleDefinition;
-    public final Resource HasNozzleDefinition_Inverse;
     public final Resource HasNozzleId;
     public final Resource HasNozzleId_Inverse;
-    public final Resource HasNozzleRestriction;
-    public final Resource HasNozzleRestriction_Inverse;
     public final Resource HasPipeDiameter;
     public final Resource HasPipeDiameter_Inverse;
     public final Resource HasPipeRun;
@@ -87,6 +85,8 @@ public class Plant3D {
     public final Resource Images_Tank;
     public final Resource ImportedOntologies;
     public final Resource InlineComponent;
+    public final Resource IsFixedNozzle;
+    public final Resource IsFixedNozzle_Inverse;
     public final Resource IsReversed;
     public final Resource IsReversed_Inverse;
     public final Resource LibraryComponent;
@@ -168,16 +168,14 @@ public class Plant3D {
         public static final String HasBranch7 = "http://www.simantics.org/Plant3D-0.1/HasBranch7";
         public static final String HasBranch8 = "http://www.simantics.org/Plant3D-0.1/HasBranch8";
         public static final String HasBranch9 = "http://www.simantics.org/Plant3D-0.1/HasBranch9";
+        public static final String HasFixedNozzles = "http://www.simantics.org/Plant3D-0.1/HasFixedNozzles";
+        public static final String HasFixedNozzles_Inverse = "http://www.simantics.org/Plant3D-0.1/HasFixedNozzles/Inverse";
         public static final String HasLength = "http://www.simantics.org/Plant3D-0.1/HasLength";
         public static final String HasLength_Inverse = "http://www.simantics.org/Plant3D-0.1/HasLength/Inverse";
         public static final String HasNext = "http://www.simantics.org/Plant3D-0.1/HasNext";
         public static final String HasNozzle = "http://www.simantics.org/Plant3D-0.1/HasNozzle";
-        public static final String HasNozzleDefinition = "http://www.simantics.org/Plant3D-0.1/HasNozzleDefinition";
-        public static final String HasNozzleDefinition_Inverse = "http://www.simantics.org/Plant3D-0.1/HasNozzleDefinition/Inverse";
         public static final String HasNozzleId = "http://www.simantics.org/Plant3D-0.1/HasNozzleId";
         public static final String HasNozzleId_Inverse = "http://www.simantics.org/Plant3D-0.1/HasNozzleId/Inverse";
-        public static final String HasNozzleRestriction = "http://www.simantics.org/Plant3D-0.1/HasNozzleRestriction";
-        public static final String HasNozzleRestriction_Inverse = "http://www.simantics.org/Plant3D-0.1/HasNozzleRestriction/Inverse";
         public static final String HasPipeDiameter = "http://www.simantics.org/Plant3D-0.1/HasPipeDiameter";
         public static final String HasPipeDiameter_Inverse = "http://www.simantics.org/Plant3D-0.1/HasPipeDiameter/Inverse";
         public static final String HasPipeRun = "http://www.simantics.org/Plant3D-0.1/HasPipeRun";
@@ -199,6 +197,8 @@ public class Plant3D {
         public static final String Images_Tank = "http://www.simantics.org/Plant3D-0.1/Images/Tank";
         public static final String ImportedOntologies = "http://www.simantics.org/Plant3D-0.1/ImportedOntologies";
         public static final String InlineComponent = "http://www.simantics.org/Plant3D-0.1/InlineComponent";
+        public static final String IsFixedNozzle = "http://www.simantics.org/Plant3D-0.1/IsFixedNozzle";
+        public static final String IsFixedNozzle_Inverse = "http://www.simantics.org/Plant3D-0.1/IsFixedNozzle/Inverse";
         public static final String IsReversed = "http://www.simantics.org/Plant3D-0.1/IsReversed";
         public static final String IsReversed_Inverse = "http://www.simantics.org/Plant3D-0.1/IsReversed/Inverse";
         public static final String LibraryComponent = "http://www.simantics.org/Plant3D-0.1/LibraryComponent";
@@ -290,16 +290,14 @@ public class Plant3D {
         HasBranch7 = getResourceOrNull(graph, URIs.HasBranch7);
         HasBranch8 = getResourceOrNull(graph, URIs.HasBranch8);
         HasBranch9 = getResourceOrNull(graph, URIs.HasBranch9);
+        HasFixedNozzles = getResourceOrNull(graph, URIs.HasFixedNozzles);
+        HasFixedNozzles_Inverse = getResourceOrNull(graph, URIs.HasFixedNozzles_Inverse);
         HasLength = getResourceOrNull(graph, URIs.HasLength);
         HasLength_Inverse = getResourceOrNull(graph, URIs.HasLength_Inverse);
         HasNext = getResourceOrNull(graph, URIs.HasNext);
         HasNozzle = getResourceOrNull(graph, URIs.HasNozzle);
-        HasNozzleDefinition = getResourceOrNull(graph, URIs.HasNozzleDefinition);
-        HasNozzleDefinition_Inverse = getResourceOrNull(graph, URIs.HasNozzleDefinition_Inverse);
         HasNozzleId = getResourceOrNull(graph, URIs.HasNozzleId);
         HasNozzleId_Inverse = getResourceOrNull(graph, URIs.HasNozzleId_Inverse);
-        HasNozzleRestriction = getResourceOrNull(graph, URIs.HasNozzleRestriction);
-        HasNozzleRestriction_Inverse = getResourceOrNull(graph, URIs.HasNozzleRestriction_Inverse);
         HasPipeDiameter = getResourceOrNull(graph, URIs.HasPipeDiameter);
         HasPipeDiameter_Inverse = getResourceOrNull(graph, URIs.HasPipeDiameter_Inverse);
         HasPipeRun = getResourceOrNull(graph, URIs.HasPipeRun);
@@ -321,6 +319,8 @@ public class Plant3D {
         Images_Tank = getResourceOrNull(graph, URIs.Images_Tank);
         ImportedOntologies = getResourceOrNull(graph, URIs.ImportedOntologies);
         InlineComponent = getResourceOrNull(graph, URIs.InlineComponent);
+        IsFixedNozzle = getResourceOrNull(graph, URIs.IsFixedNozzle);
+        IsFixedNozzle_Inverse = getResourceOrNull(graph, URIs.IsFixedNozzle_Inverse);
         IsReversed = getResourceOrNull(graph, URIs.IsReversed);
         IsReversed_Inverse = getResourceOrNull(graph, URIs.IsReversed_Inverse);
         LibraryComponent = getResourceOrNull(graph, URIs.LibraryComponent);

diff --git a/org.simantics.plant3d.product.feature/feature.xml b/org.simantics.plant3d.product.feature/feature.xml
index d5fcf108e72d9baa3bc89d7dd038aa13d8e67405..58c3143d2c5b961f957d9d95943dca27e0116d6d 100644 (file)
--- a/org.simantics.plant3d.product.feature/feature.xml
+++ b/org.simantics.plant3d.product.feature/feature.xml
@@ -33,7 +33,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.simantics.plant3d.modeling"
+         id="org.simantics.plant3d.modeling.feature"
          version="0.0.0"/>
 
    <plugin

diff --git a/org.simantics.plant3d.product.feature/pom.xml b/org.simantics.plant3d.product.feature/pom.xml
new file mode 100644 (file)
index 0000000..ac0537e
--- /dev/null
+++ b/org.simantics.plant3d.product.feature/pom.xml
@@ -0,0 +1,15 @@
+<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.g3d</groupId>\r
+               <artifactId>org.simantics.g3d.root</artifactId>\r
+               <version>1.0.0-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.plant3d.product.feature</artifactId>\r
+       <packaging>eclipse-feature</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+</project>\r

diff --git a/org.simantics.plant3d.product.repository/.project b/org.simantics.plant3d.product.repository/.project
new file mode 100644 (file)
index 0000000..b11b67c
--- /dev/null
+++ b/org.simantics.plant3d.product.repository/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.simantics.plant3d.product.repository</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+       </buildSpec>
+       <natures>
+       </natures>
+</projectDescription>

diff --git a/org.simantics.plant3d.product/plant3d.product b/org.simantics.plant3d.product.repository/plant3d.product
similarity index 100%
rename from org.simantics.plant3d.product/plant3d.product
rename to org.simantics.plant3d.product.repository/plant3d.product

diff --git a/org.simantics.plant3d.product.repository/pom.xml b/org.simantics.plant3d.product.repository/pom.xml
new file mode 100644 (file)
index 0000000..ad57441
--- /dev/null
+++ b/org.simantics.plant3d.product.repository/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+       <artifactId>org.simantics.plant3d.product.repository</artifactId>
+       <version>1.0.0-SNAPSHOT</version>
+       <packaging>eclipse-repository</packaging>
+       
+       <parent>
+               <groupId>org.simantics.g3d</groupId>
+               <artifactId>org.simantics.g3d.root</artifactId>
+               <version>1.0.0-SNAPSHOT</version>
+       </parent>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-p2-repository-plugin</artifactId>
+                               <version>${tycho-version}</version>
+                               <configuration>
+                                       <includeAllDependencies>true</includeAllDependencies>
+                                       <skipArchive>true</skipArchive>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-p2-director-plugin</artifactId>
+                               <version>${tycho-version}</version>
+                               <executions>
+                                       <execution>
+                                               <id>materialize-products</id>
+                                               <goals>
+                                                       <goal>materialize-products</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>archive-products</id>
+                                               <goals>
+                                                       <goal>archive-products</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <products>
+                                               <product>
+                                                       <id>P3D.product</id>
+                                                       <archiveFileName>plant3d-${build.tag}</archiveFileName>
+                                                       <rootFolder>plant3d-${build.tag}</rootFolder>
+                                               </product>
+                                       </products>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+
+</project>

diff --git a/org.simantics.plant3d.product/pom.xml b/org.simantics.plant3d.product/pom.xml
new file mode 100644 (file)
index 0000000..11ef0db
--- /dev/null
+++ b/org.simantics.plant3d.product/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+       <artifactId>org.simantics.plant3d.product</artifactId>
+       <version>1.0.0-SNAPSHOT</version>
+       <packaging>eclipse-plugin</packaging>
+       
+       <parent>
+               <groupId>org.simantics.g3d</groupId>
+               <artifactId>org.simantics.g3d.root</artifactId>
+               <version>1.0.0-SNAPSHOT</version>
+       </parent>
+</project>

diff --git a/org.simantics.plant3d/pom.xml b/org.simantics.plant3d/pom.xml
new file mode 100644 (file)
index 0000000..f8b057c
--- /dev/null
+++ b/org.simantics.plant3d/pom.xml
@@ -0,0 +1,17 @@
+<?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.g3d</groupId>\r
+               <artifactId>org.simantics.g3d.root</artifactId>\r
+               <version>1.0.0-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <artifactId>org.simantics.plant3d</artifactId>\r
+       <packaging>eclipse-plugin</packaging>\r
+       <version>1.0.0-SNAPSHOT</version>\r
+\r
+</project>\r

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java
index 509ab38cce6e9120f94a1e732768b4af0f993e64..c922f38f54a5a64eab9e5612d508605fa8c0f569 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/RoutePipeAction.java
@@ -864,7 +864,7 @@ public class RoutePipeAction extends vtkSwtAction {
                String info = "";
                Point3d sStart = new Point3d();
                Point3d sEnd = new Point3d();
-               s.getControlPointEnds(sStart, sEnd);
+               s.getEnds(sStart, sEnd);
                //detector.clearConstraintHighlights();
                
                Point3d previousPipePoint = new Point3d(previousPosition);

diff --git a/pom.xml b/pom.xml
index e278711e7e4edbf3f8e40108b1abad75b29d8638..50a579b7d1eb77fdea781741279da36869576393 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,9 @@
        <properties>
                <branch-spec>master</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
-               <tycho-version>1.0.0</tycho-version>
-               <tycho-extras-version>1.0.0</tycho-extras-version>
+               <tycho-version>1.4.0</tycho-version>
+               <tycho-extras-version>1.4.0</tycho-extras-version>
+               <build.tag>SNAPSHOT</build.tag>
        </properties>
 
        <repositories>
@@ -145,5 +146,12 @@
                <module>org.simantics.g3d.feature</module>
 
                <module>org.simantics.g3d.repository</module>
+               
+               <module>org.simantics.plant3d</module>
+               <module>org.simantics.plant3d.modeling.feature</module>
+               <module>org.simantics.plant3d.ontology</module>
+               <module>org.simantics.plant3d.product</module>
+               <module>org.simantics.plant3d.product.feature</module>
+               <module>org.simantics.plant3d.product.repository</module>
        </modules>
 </project>