Sync git svn branch with SVN repository r33184.
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 9 Sep 2016 12:46:09 +0000 (15:46 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 9 Sep 2016 12:46:09 +0000 (15:46 +0300)
refs #6621
refs #6679
refs #6682

bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectionBuilder.java
bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/IAbstractRequestInterface.java
bundles/org.simantics.fileimport/build.properties
features/org.simantics.sdk.feature/feature.xml
releng/org.simantics.target/rmap/SDK.rmap
releng/org.simantics.target/rmap/Simantics.rmap

index 6b78af1b8b9730d11aba55591a8b3834f6c91442..1fcf074cdf8c2863517aea5b22f225f265097764 100644 (file)
@@ -70,6 +70,7 @@ import org.simantics.g2d.element.handler.EdgeVisuals.EdgeEnd;
 import org.simantics.g2d.element.impl.Element;\r
 import org.simantics.g2d.elementclass.BranchPoint;\r
 import org.simantics.g2d.elementclass.FlagClass;\r
+import org.simantics.g2d.elementclass.FlagClass.Type;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.modeling.ModelingResources;\r
 import org.simantics.scl.runtime.tuple.Tuple2;\r
@@ -548,6 +549,22 @@ public class ConnectionBuilder {
         Resource flagConnection = ConnectionUtil.getConnection(graph, flagConnector);\r
         Collection<Resource> flagRouteNodes = graph.getObjects(flagConnector, DIA.AreConnected);\r
 \r
+        Resource connectionToKeep = attachToConnection;\r
+        Resource connectionToRemove = flagConnection;\r
+        if (!connectionToKeep.equals(connectionToRemove)) {\r
+            Resource hasElementToComponent1 = graph.getPossibleObject(attachToConnection, MOD.ElementToComponent);\r
+            Resource hasElementToComponent2 = graph.getPossibleObject(flagConnection, MOD.ElementToComponent);\r
+            Type flagType = FlagUtil.getFlagType(graph, flagToRemove);\r
+            if (hasElementToComponent1 != null && hasElementToComponent2 != null)\r
+                throw new UnsupportedOperationException(\r
+                        "Both attached connection " + attachToConnection + " and flag connection " + flagConnection\r
+                        + " have mapped components, can't decide which connection to remove in join operation");\r
+            if (hasElementToComponent2 != null || flagType == Type.Out) {\r
+                connectionToKeep = flagConnection;\r
+                connectionToRemove = attachToConnection;\r
+            }\r
+        }\r
+\r
         // Remove flag and its connector.\r
         graph.deny(flagToConnector);\r
         new RemoveElement((Resource)diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE), flagToRemove).perform(graph);\r
@@ -564,19 +581,26 @@ public class ConnectionBuilder {
             }\r
         }\r
 \r
-        for (Statement routeNode : graph.getStatements(flagConnection, DIA.HasInteriorRouteNode)) {\r
-            graph.deny(routeNode);\r
-            graph.claim(attachToConnection, routeNode.getPredicate(), routeNode.getObject());\r
-        }\r
-        for (Statement connector : graph.getStatements(flagConnection, DIA.HasConnector)) {\r
-            graph.deny(connector);\r
-            graph.claim(attachToConnection, connector.getPredicate(), connector.getObject());\r
-        }\r
+        moveStatements(graph, connectionToRemove, connectionToKeep, DIA.HasInteriorRouteNode);\r
+        moveStatements(graph, connectionToRemove, connectionToKeep, DIA.HasConnector);\r
+\r
+        // Remove obsolete connection\r
+        if (!connectionToKeep.equals(connectionToRemove))\r
+            cu.removeConnection(connectionToRemove);\r
 \r
         CommentMetadata cm = graph.getMetadata(CommentMetadata.class);\r
         graph.addMetadata(cm.add("Joined connection to disconnected flag"));\r
     }\r
 \r
+    private void moveStatements(WriteGraph graph, Resource source, Resource target, Resource movedRelation) throws DatabaseException {\r
+        if (!source.equals(target)) {\r
+            for (Statement s : graph.getStatements(source, movedRelation)) {\r
+                graph.deny(s);\r
+                graph.claim(target, s.getPredicate(), s.getObject());\r
+            }\r
+        }\r
+    }\r
+\r
     private Collection<Resource> removeUntilOrientedRouteline(WriteGraph graph, boolean expectedOrientation, Resource routeNode) throws DatabaseException {\r
         List<Resource> result = new ArrayList<>(2);\r
         Deque<Resource> work = new ArrayDeque<>(2);\r
index 5253b3ed9ba558b5a9c179614eb33f4b890df1ad..0419534909e6bdc73df3c28efc63c854f0616b0d 100644 (file)
@@ -15,4 +15,5 @@ public interface IAbstractRequestInterface {
        public void subscribeDocument(String document, String sessionGUID, IDocumentListener documentListener);\r
        public IJSONResult readChanges(String uri, String sessionGUID, int sequenceNumber);\r
        public void initializeDocument(String documentURI, String sessionGUID, CommandContext context);\r
+       public void onPoll(String sessionGUID);\r
 }\r
index a98f3f123faa5096d5dd4a851450b459a923c714..a26ce7b6b2a5e0189f176ee2c720b1a89222252d 100644 (file)
@@ -1,7 +1,7 @@
 output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
-               OSGI-INF/FileReferenceFileImport.xml,\\r
+               OSGI-INF/,\r
                OSGI-INF/FileReferenceFileImport.xml,\\r
                OSGI-INF/LibraryFolderFileImport.xml,\\r
                scl/\r
index 41c08423a25f697be346a3d5d50a45837dc27211..ee4a899a1b96203e929900913ac656a1e0a93700 100644 (file)
          id="org.simantics.document.linking"\r
          version="0.0.0"/>\r
 \r
+   <plugin\r
+         id="org.simantics.fileimport"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.simantics.fileimport.ui"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
 </feature>\r
index 71eeaa710ee332e25712453a494bbc33915ec813..30cba0d39142725517a933f61b0f0a957cabc688 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <rmap
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns="http://www.eclipse.org/buckminster/RMap-1.0"
-       xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
-       xmlns:pv="http://www.eclipse.org/buckminster/Provider-1.0">
-       
-       <property key="SIMANTICS" value="https://{1}:{2}@www.simantics.org/svn/simantics"/>
-       
-       <searchPath name="2d">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/2d/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/2d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="3d">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/3d/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="agent">
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/agent/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="desktop">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/desktop/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/desktop/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="db">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/db/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/db/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="documentation">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/documentation/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/documentation/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="foundation">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                               <bc:propertyRef key="simantics.user" />
-                               <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                               <bc:propertyRef key="simantics.user" />
-                               <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://www.eclipse.org/buckminster/RMap-1.0"
+    xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
+    xmlns:pv="http://www.eclipse.org/buckminster/Provider-1.0">
+    
+    <property key="SIMANTICS" value="https://{1}:{2}@www.simantics.org/svn/simantics"/>
+    
+    <searchPath name="2d">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/2d/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/2d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="3d">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/3d/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="agent">
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/agent/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="desktop">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/desktop/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/desktop/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="db">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/db/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/db/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="documentation">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/documentation/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/documentation/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="foundation">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
     
     <searchPath name="foundation/base">
         <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
             </uri>
         </provider>
     </searchPath>
-       
-       <searchPath name="foundation/breakdown">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/breakdown/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                               <bc:propertyRef key="simantics.user" />
-                               <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/breakdown/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                               <bc:propertyRef key="simantics.user" />
-                               <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+    
+    <searchPath name="foundation/breakdown">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/breakdown/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/breakdown/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
  
-       <searchPath name="foundation/browsing">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/browsing/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                               <bc:propertyRef key="simantics.user" />
-                               <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/browsing/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                               <bc:propertyRef key="simantics.user" />
-                               <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+    <searchPath name="foundation/browsing">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/browsing/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/browsing/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
     
     <searchPath name="foundation/charts">
         <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
             </uri>
         </provider>
     </searchPath>
-       
-       <searchPath name="foundation/databoard">
+    
+    <searchPath name="foundation/databoard">
         <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
             <uri format="${SIMANTICS}/foundation/databoard/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
                 <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.password" />
             </uri>
         </provider>
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/databoard/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/databoard/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
+            </uri>
+        </provider>
+    </searchPath>
+    
     <searchPath name="foundation/devs">
         <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/devs/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            <uri format="${SIMANTICS}/foundation/devs/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/devs/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/devs/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+            </uri>
+        </provider>
+    </searchPath>
     
     <searchPath name="foundation/document">
         <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
             </uri>
         </provider>
     </searchPath>
-       
-       <searchPath name="foundation/message">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/message/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+    
+    <searchPath name="foundation/message">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/message/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/message/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/message/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
+            </uri>
+        </provider>
+    </searchPath>
+    
     <searchPath name="foundation/migration">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/migration/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/migration/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/migration/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/migration/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+            </uri>
+        </provider>
+    </searchPath>
     
-       <searchPath name="foundation/project">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/project/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+    <searchPath name="foundation/project">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/project/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/project/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/project/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="foundation/ontologies">
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/ontologies/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="foundation/ontologies">
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/ontologies/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+            </uri>
+        </provider>
+    </searchPath>
 
-       <searchPath name="foundation/team">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/team/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+    <searchPath name="foundation/team">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/team/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/team/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/team/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+            </uri>
+        </provider>
+    </searchPath>
 
-       <searchPath name="foundation/views">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/views/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/foundation/views/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="issues">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/issues/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/issues/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="modeling">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/modeling/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/modeling/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="ode">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/ode/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/ode/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="operating">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/operating/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/operating/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="project">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/project/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/project/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="scl">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/scl/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/scl/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
+    <searchPath name="foundation/views">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/views/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/foundation/views/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="issues">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/issues/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/issues/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="modeling">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/modeling/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/modeling/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="ode">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/ode/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/ode/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="operating">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/operating/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/operating/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="project">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/project/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/project/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="scl">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/scl/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/scl/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    
     <searchPath name="spreadsheet">
         <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
             <uri format="${SIMANTICS}/spreadsheet/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
         </provider>
     </searchPath>
     
-       <searchPath name="third-party">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/third-party/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+    <searchPath name="third-party">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/third-party/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
             <uri format="${SIMANTICS}/third-party/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <searchPath name="utils">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/utils/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <searchPath name="utils">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/utils/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>     
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/utils/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider> 
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/utils/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+            </uri>
+        </provider>
+    </searchPath>
 
-       <searchPath name="utils/optimization">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/utils/optimization/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+    <searchPath name="utils/optimization">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/utils/optimization/trunk/{0}.feature?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>     
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/utils/optimization/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
-                               <bc:propertyRef key="buckminster.component" />
+            </uri>
+        </provider> 
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}/utils/optimization/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
+            </uri>
+        </provider>
+    </searchPath>
 
     <searchPath name="wiki">
         <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
         </provider>
     </searchPath>
 
-       <searchPath name="workbench">
-               <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
-                       <uri format="${SIMANTICS}/workbench/trunk/{0}.feature?moduleAfterBranch&amp;moduleAfterTag">
-                               <bc:propertyRef key="buckminster.component" />
+    <searchPath name="workbench">
+        <provider readerType="svn" componentTypes="eclipse.feature" mutable="true" source="true">
+            <uri format="${SIMANTICS}/workbench/trunk/{0}.feature?moduleAfterBranch&amp;moduleAfterTag">
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>             
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            </uri>
+        </provider>     
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
             <uri format="${SIMANTICS}/workbench/trunk/{0}?moduleAfterBranch&amp;moduleAfterTag">
-                               <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="buckminster.component" />
                 <bc:propertyRef key="simantics.user" />
                 <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       
-       <!-- Personal development locations     -->
+            </uri>
+        </provider>
+    </searchPath>
+    
+    <!-- Personal development locations -->
 
     <!--
-       <searchPath name="hannu">               
-               <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
-                       <uri format="${SIMANTICS}-incubator/hannu/{0}">
-                               <bc:propertyRef key="buckminster.component" />
-                <bc:propertyRef key="simantics.user" />
-                <bc:propertyRef key="simantics.password" />
-                       </uri>
-               </provider>
-       </searchPath>
-       -->
-       
-       <!-- Locators -->
-       <locator searchPathRef="foundation/document" pattern="^org\.simantics\.document\.base\.ontology$"/>
-       <!-- This resolves org.simantics.layer0 PLUG-IN, FEATURE is resolved later, do not fail on error -->
-       <locator searchPathRef="foundation/ontologies" pattern="^org\.simantics\.layer0$" failOnError="false"/>
-       <locator searchPathRef="foundation/ontologies" pattern="^org\.simantics\.([^\.]+\.)+ontology$" failOnError="false"/>
+    <searchPath name="hannu">       
+        <provider readerType="svn" componentTypes="osgi.bundle" mutable="true" source="true">
+            <uri format="${SIMANTICS}-incubator/hannu/{0}">
+                <bc:propertyRef key="buckminster.component" />
+                <bc:propertyRef key="simantics.user" />
+                <bc:propertyRef key="simantics.password" />
+            </uri>
+        </provider>
+    </searchPath>
+    -->
+    
+    <!-- Locators -->
+    <locator searchPathRef="foundation/document" pattern="^org\.simantics\.document\.base\.ontology$"/>
+    <!-- This resolves org.simantics.layer0 PLUG-IN, FEATURE is resolved later, do not fail on error -->
+    <locator searchPathRef="foundation/ontologies" pattern="^org\.simantics\.layer0$" failOnError="false"/>
+    <locator searchPathRef="foundation/ontologies" pattern="^org\.simantics\.([^\.]+\.)+ontology$" failOnError="false"/>
 
-       <locator searchPathRef="2d" pattern="^net\.sf\.cglib"/>
-       <locator searchPathRef="2d" pattern="^org\.simantics\.g2d"/>
-       <locator searchPathRef="2d" pattern="^org\.simantics\.diagram" failOnError="false"/>
-       <locator searchPathRef="2d" pattern="^org\.simantics\.scenegraph"/>
-       <locator searchPathRef="3d" pattern="^org\.simantics\.g3d"/>
-       <locator searchPathRef="3d" pattern="^org\.simantics\.objmap2"/>
-       <locator searchPathRef="3d" pattern="^org\.simantics\.opencascade"/>
-       <locator searchPathRef="agent" pattern="^org\.simantics\.agent"/>
-       <locator searchPathRef="db" pattern="^org\.simantics\.db"/>
-       <locator searchPathRef="db" pattern="^org\.simantics\.datatypes"/>
-       <locator searchPathRef="db" pattern="^org\.simantics\.layer0.utils$"/>
-       <!-- This resolves org.simantics.layer0 FEATURE, PLUG-IN should already be resolved earlier -->
-       <locator searchPathRef="db" pattern="^org\.simantics\.layer0$"/>
-       <locator searchPathRef="desktop" pattern="^org\.simantics\.desktop"/>
-       <locator searchPathRef="foundation/base" pattern="^org\.simantics\.common$"/>
-       <locator searchPathRef="foundation/base" pattern="^org\.simantics$"/>
-       <locator searchPathRef="foundation/base" pattern="^org\.simantics\.export"/>
-       <locator searchPathRef="foundation/breakdown" pattern="^org\.simantics\.breakdown"/>
-       <locator searchPathRef="foundation/browsing" pattern="^org\.simantics\.browsing"/>
-       <locator searchPathRef="foundation/browsing" pattern="^org\.simantics\.selectionview"/>
-       <locator searchPathRef="foundation/charts" pattern="^org\.simantics\.charts"/>
-       <locator searchPathRef="foundation/charts" pattern="^org\.simantics\.trend"/>
-       <locator searchPathRef="foundation/databoard" pattern="^org\.simantics\.data"/> 
-       <locator searchPathRef="foundation/databoard" pattern="^org\.simantics\.databoard"/>
-       <locator searchPathRef="foundation/devs" pattern="^org\.simantics\.devs"/>
-       <locator searchPathRef="foundation/document" pattern="^org\.simantics\.document"/>
-       <locator searchPathRef="foundation/event" pattern="^org\.simantics\.event"/>
-       <locator searchPathRef="foundation/graphfile" pattern="^org\.simantics\.graphfile"/>
-       <locator searchPathRef="foundation/message" pattern="^org\.simantics\.message"/>
-       <locator searchPathRef="foundation/migration" pattern="^org\.simantics\.migration"/>
-       <locator searchPathRef="foundation/project" pattern="^org\.simantics\.project" failOnError="false"/>
-       <locator searchPathRef="foundation/team" pattern="^org\.simantics\.team"/>
-       <locator searchPathRef="foundation/views" pattern="^org\.simantics\.views"/>
-       <locator searchPathRef="issues" pattern="^org\.simantics\.issues"/>
-       <locator searchPathRef="modeling" pattern="^org\.simantics\.annotation"/>
-       <locator searchPathRef="modeling" pattern="^org\.simantics\.image"/>
-       <locator searchPathRef="modeling" pattern="^org\.simantics\.mapping"/>
-       <locator searchPathRef="modeling" pattern="^org\.simantics\.modeling"/>
-       <locator searchPathRef="modeling" pattern="^org\.simantics\.structural" failOnError="false"/>
-       <locator searchPathRef="ode" pattern="^org\.simantics\.graph$"/>
-       <locator searchPathRef="ode" pattern="^org\.simantics\.graph\."/>
-       <locator searchPathRef="ode" pattern="^org\.simantics\.ltk"/>
-       <locator searchPathRef="ode" pattern="^org\.simantics\.ode"/>
-       <locator searchPathRef="operating" pattern="^org\.simantics\.operating"/>       
-       <locator searchPathRef="project" pattern="^org\.simantics\.project"/>
-       <locator searchPathRef="scl" pattern="^org\.cojen"/>
-       <locator searchPathRef="scl" pattern="^org\.simantics\.scl"/>
-       <locator searchPathRef="spreadsheet" pattern="^org\.simantics\.spreadsheet"/>
-       <locator searchPathRef="spreadsheet" pattern="^org\.simantics\.excel"/>
-       <locator searchPathRef="third-party" pattern="^xtc\.parser\.runtime"/>
-       <locator searchPathRef="third-party" pattern="^org\.lobobrowser\.cobra"/>
-       <locator searchPathRef="third-party" pattern="^org\.ini4j"/>
-       <locator searchPathRef="third-party" pattern="^org\.objectweb\.asm5"/>
-       <locator searchPathRef="third-party" pattern="^it\.unimi\.dsi\.fastutil"/>
-       <locator searchPathRef="third-party" pattern="^winterwell\.markdown"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.eclipsec"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.backup"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.basicexpression"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.fastlz"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.compressions"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.lz4"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.gnuplot"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.graphviz"/>
+    <locator searchPathRef="2d" pattern="^net\.sf\.cglib"/>
+    <locator searchPathRef="2d" pattern="^org\.simantics\.g2d"/>
+    <locator searchPathRef="2d" pattern="^org\.simantics\.diagram" failOnError="false"/>
+    <locator searchPathRef="2d" pattern="^org\.simantics\.scenegraph"/>
+    <locator searchPathRef="3d" pattern="^org\.simantics\.g3d"/>
+    <locator searchPathRef="3d" pattern="^org\.simantics\.objmap2"/>
+    <locator searchPathRef="3d" pattern="^org\.simantics\.opencascade"/>
+    <locator searchPathRef="agent" pattern="^org\.simantics\.agent"/>
+    <locator searchPathRef="db" pattern="^org\.simantics\.db"/>
+    <locator searchPathRef="db" pattern="^org\.simantics\.datatypes"/>
+    <locator searchPathRef="db" pattern="^org\.simantics\.layer0.utils$"/>
+    <!-- This resolves org.simantics.layer0 FEATURE, PLUG-IN should already be resolved earlier -->
+    <locator searchPathRef="db" pattern="^org\.simantics\.layer0$"/>
+    <locator searchPathRef="desktop" pattern="^org\.simantics\.desktop"/>
+    <locator searchPathRef="foundation/base" pattern="^org\.simantics\.common$"/>
+    <locator searchPathRef="foundation/base" pattern="^org\.simantics$"/>
+    <locator searchPathRef="foundation/base" pattern="^org\.simantics\.export"/>
+    <locator searchPathRef="foundation/breakdown" pattern="^org\.simantics\.breakdown"/>
+    <locator searchPathRef="foundation/browsing" pattern="^org\.simantics\.browsing"/>
+    <locator searchPathRef="foundation/browsing" pattern="^org\.simantics\.selectionview"/>
+    <locator searchPathRef="foundation/charts" pattern="^org\.simantics\.charts"/>
+    <locator searchPathRef="foundation/charts" pattern="^org\.simantics\.trend"/>
+    <locator searchPathRef="foundation/databoard" pattern="^org\.simantics\.data"/> 
+    <locator searchPathRef="foundation/databoard" pattern="^org\.simantics\.databoard"/>
+    <locator searchPathRef="foundation/devs" pattern="^org\.simantics\.devs"/>
+    <locator searchPathRef="foundation/document" pattern="^org\.simantics\.document"/>
+    <locator searchPathRef="foundation/event" pattern="^org\.simantics\.event"/>
+    <locator searchPathRef="foundation/graphfile" pattern="^org\.simantics\.graphfile"/>
+    <locator searchPathRef="foundation/message" pattern="^org\.simantics\.message"/>
+    <locator searchPathRef="foundation/migration" pattern="^org\.simantics\.migration"/>
+    <locator searchPathRef="foundation/project" pattern="^org\.simantics\.project" failOnError="false"/>
+    <locator searchPathRef="foundation/team" pattern="^org\.simantics\.team"/>
+    <locator searchPathRef="foundation/views" pattern="^org\.simantics\.views"/>
+    <locator searchPathRef="issues" pattern="^org\.simantics\.issues"/>
+    <locator searchPathRef="modeling" pattern="^org\.simantics\.annotation"/>
+    <locator searchPathRef="modeling" pattern="^org\.simantics\.image"/>
+    <locator searchPathRef="modeling" pattern="^org\.simantics\.mapping"/>
+    <locator searchPathRef="modeling" pattern="^org\.simantics\.modeling"/>
+    <locator searchPathRef="modeling" pattern="^org\.simantics\.structural" failOnError="false"/>
+    <locator searchPathRef="ode" pattern="^org\.simantics\.graph$"/>
+    <locator searchPathRef="ode" pattern="^org\.simantics\.graph\."/>
+    <locator searchPathRef="ode" pattern="^org\.simantics\.ltk"/>
+    <locator searchPathRef="ode" pattern="^org\.simantics\.ode"/>
+    <locator searchPathRef="operating" pattern="^org\.simantics\.operating"/>   
+    <locator searchPathRef="project" pattern="^org\.simantics\.project"/>
+    <locator searchPathRef="scl" pattern="^org\.cojen"/>
+    <locator searchPathRef="scl" pattern="^org\.simantics\.scl"/>
+    <locator searchPathRef="spreadsheet" pattern="^org\.simantics\.spreadsheet"/>
+    <locator searchPathRef="spreadsheet" pattern="^org\.simantics\.excel"/>
+    <locator searchPathRef="third-party" pattern="^xtc\.parser\.runtime"/>
+    <locator searchPathRef="third-party" pattern="^org\.lobobrowser\.cobra"/>
+    <locator searchPathRef="third-party" pattern="^org\.ini4j"/>
+    <locator searchPathRef="third-party" pattern="^org\.objectweb\.asm5"/>
+    <locator searchPathRef="third-party" pattern="^it\.unimi\.dsi\.fastutil"/>
+    <locator searchPathRef="third-party" pattern="^winterwell\.markdown"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.eclipsec"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.backup"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.basicexpression"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.fastlz"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.compressions"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.fileimport"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.lz4"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.gnuplot"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.graphviz"/>
     <locator searchPathRef="utils" pattern="^org\.simantics\.msvc\.runtime"/>
     <locator searchPathRef="utils" pattern="^org\.simantics\.nativemem"/>
-       <locator searchPathRef="utils" pattern="^org\.simantics\.utils"/>
-       <locator searchPathRef="utils" pattern="^net\.jpountz\.lz4$"/>
-       <locator searchPathRef="utils/optimization" pattern="^org\.simantics\.newuoa$"/>
-       <locator searchPathRef="utils/optimization" pattern="^org\.simantics\.optimization$"/>
-       <locator searchPathRef="wiki" pattern="^org\.simantics\.wiki"/>
-       <locator searchPathRef="workbench" pattern="^org\.simantics\.sdk"/>     
-       <locator searchPathRef="workbench" pattern="^org\.simantics\.workbench"/>
+    <locator searchPathRef="utils" pattern="^org\.simantics\.utils"/>
+    <locator searchPathRef="utils" pattern="^net\.jpountz\.lz4$"/>
+    <locator searchPathRef="utils/optimization" pattern="^org\.simantics\.newuoa$"/>
+    <locator searchPathRef="utils/optimization" pattern="^org\.simantics\.optimization$"/>
+    <locator searchPathRef="wiki" pattern="^org\.simantics\.wiki"/>
+    <locator searchPathRef="workbench" pattern="^org\.simantics\.sdk"/> 
+    <locator searchPathRef="workbench" pattern="^org\.simantics\.workbench"/>
 
-       <locator searchPathRef="documentation" pattern="^org\.simantics\.foundation\.doc"/>
-       <locator searchPathRef="documentation" pattern="^org\.simantics\.doc\.isv"/>
+    <locator searchPathRef="documentation" pattern="^org\.simantics\.foundation\.doc"/>
+    <locator searchPathRef="documentation" pattern="^org\.simantics\.doc\.isv"/>
 
-       <!-- Fallback locations (no pattern) -->
-       <locator searchPathRef="foundation" failOnError="false"/>
+    <!-- Fallback locations (no pattern) -->
+    <locator searchPathRef="foundation" failOnError="false"/>
 
-<!--
-        <searchPath name="eclipse-nebula">
-                <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                        <uri format="http://download.eclipse.org/technology/nebula/snapshot" />
-                </provider>
-                <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                        <uri format="http://download.eclipse.org/technology/nebula/incubation/snapshot" />
-                </provider>
-        </searchPath>
--->
-       <searchPath name="eclipse-nebula">
-               <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                       <uri format="http://www.simantics.org/update/nebula-snapshot-20140415" />
-               </provider>
-               <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                       <uri format="http://www.simantics.org/update/nebula-incubation-snapshot-20140415" />
-               </provider>
-       </searchPath>
-       <searchPath name="eclipse-nebula-incubation">
-               <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                       <uri format="http://www.simantics.org/update/nebula-incubation-snapshot-20140415" />
-               </provider>
-               <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                       <uri format="http://www.simantics.org/update/nebula-incubation-incubation-snapshot-20140415" />
-               </provider>
-       </searchPath>
-       <searchPath name="eclipse-nebula-nattable">
-               <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                       <uri format="http://www.simantics.org/update/nattable-1.0.1" />
-               </provider>
-               <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
-                       <uri format="http://www.simantics.org/update/nattable-1.0.1" />
-               </provider>
-       </searchPath>
+    <searchPath name="eclipse-nebula">
+        <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
+            <uri format="http://www.simantics.org/update/nebula/Q22016/release" />
+        </provider>
+    </searchPath>
+    <searchPath name="eclipse-nebula-incubation">
+        <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
+            <uri format="http://www.simantics.org/update/nebula/Q22016/incubation" />
+        </provider>
+    </searchPath>
+    <searchPath name="eclipse-nebula-nattable">
+        <provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
+            <uri format="http://www.simantics.org/update/nebula/nattable/releases/1.4.0/repository" />
+        </provider>
+    </searchPath>
 
     <locator searchPathRef="third-party" pattern="^org\.apache\.commons\.lang" failOnError="false" />
     <locator searchPathRef="third-party" pattern="^org\.apache\.commons\.compress" failOnError="false" />
     <locator searchPathRef="third-party" pattern="^org\.eclipse\.nebula\.widgets\.nattable" failOnError="false" />
     <locator searchPathRef="third-party" pattern="^org\.jdom2" failOnError="false" />
     <locator searchPathRef="third-party" pattern="^net\.ucanaccess" failOnError="false" />
-       <locator searchPathRef="eclipse-nebula" pattern="^org\.eclipse\.nebula" failOnError="false" />
-       <locator searchPathRef="eclipse-nebula-incubation" pattern="^org\.eclipse\.nebula" failOnError="false" />
-       <locator searchPathRef="eclipse-nebula-nattable" pattern="^org\.eclipse\.nebula" failOnError="false" />
+    <locator searchPathRef="eclipse-nebula" pattern="^org\.eclipse\.nebula" failOnError="false" />
+    <locator searchPathRef="eclipse-nebula-incubation" pattern="^org\.eclipse\.nebula" failOnError="false" />
+    <locator searchPathRef="eclipse-nebula-nattable" pattern="^org\.eclipse\.nebula" failOnError="false" />
 
 </rmap>
 
index bddbcf45aa08ad993d98af247d5cbb0c2aeb01b7..da0e1ec2a9883f438c6d28b724ec7e519dd75298 100644 (file)
@@ -2,15 +2,6 @@
 <rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.eclipse.org/buckminster/RMap-1.0"
        xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:pv="http://www.eclipse.org/buckminster/Provider-1.0">
 
-<!--
-       <redirect href="Modelica.rmap" pattern="^org\.simantics\.modelica" />
-
-       <redirect href="Sysdyn.rmap" pattern="^org\.simantics\.modelica" />
-       <redirect href="Sysdyn.rmap" pattern="^org\.simantics\.objmap" />
-       <redirect href="Sysdyn.rmap" pattern="^org\.simantics\.openmodelica" />
-       <redirect href="Sysdyn.rmap" pattern="^org\.simantics\.sysdyn" />
--->
-
        <redirect href="SDK.rmap" pattern="^org\.apache" />
        <redirect href="SDK.rmap" pattern="^org\.cojen" />
        <redirect href="SDK.rmap" pattern="^org\.jdom2" />