290952: [CDO] Support for CDO model repository

https://bugs.eclipse.org/bugs/show_bug.cgi?id=290952

Merged the cdo_kepler branch to the trunk (r9967 -> r10361). Papyrus features and Releng

6 files changed, 34 insertions, 4 deletions

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
index 39f07b6ae23..26b4f25ea00 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="%providerName">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de
+      Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de
 Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana
 and others 
 All rights reserved.   This program and the accompanying materials
@@ -52,4 +52,8 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.papyrus.uml.export.feature"

          version="0.0.0"/>

 

+   <includes

+         id="org.eclipse.papyrus.exta.cdo.feature"

+         version="0.0.0"/>

+

 </feature>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
index cf7302fd277..112b11be503 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="%providerName">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2008-2012 CEA LIST, Atos Origin, Conselleria de
+      Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de
 Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana
 and others 
 All rights reserved.   This program and the accompanying materials
@@ -56,4 +56,8 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.papyrus.uml.export.source.feature"

          version="0.0.0"/>

 

+   <includes

+         id="org.eclipse.papyrus.extra.cdo.source.feature"

+         version="0.0.0"/>

+

 </feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index c2f3110de77..c75e4b1f9c0 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -7,7 +7,7 @@
       plugin="org.eclipse.papyrus.infra.core">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2012 CEA LIST
+      Copyright (c) 2012, 2013 CEA LIST
 All rights reserved.   This program and the accompanying materials
 are made available under the terms of the Eclipse Public License
 v1.0
@@ -127,4 +127,8 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.papyrus.infra.discovery.feature"

          version="0.0.0"/>

 

+   <includes

+         id="org.eclipse.papyrus.views.validation.feature"

+         version="0.0.0"/>

+

 </feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
index 6f763742813..51b6e07c762 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="Eclipse Modeling Project">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2012 CEA LIST
+      Copyright (c) 2012, 2013 CEA LIST
 All rights reserved.   This program and the accompanying materials
 are made available under the terms of the Eclipse Public License
 v1.0
@@ -126,4 +126,8 @@ http://www.eclipse.org/legal/epl-v10.html
          id="org.eclipse.papyrus.infra.discovery.source.feature"

          version="0.0.0"/>

 

+   <includes

+         id="org.eclipse.papyrus.views.validation.source.feature"

+         version="0.0.0"/>

+

 </feature>

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
index 72ca79dfc89..0f14302f7e8 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
@@ -87,6 +87,14 @@
       </rm:uri>

     </rm:provider>

     

+    <!-- Papyrus CDO -->

+    <rm:provider componentTypes="osgi.bundle" readerType="local">

+      <rm:uri format="{0}/extraplugins/cdo/{1}">

+        <bc:propertyRef key="local.repository"/>

+        <bc:propertyRef key="buckminster.component"/>

+      </rm:uri>

+    </rm:provider>

+    

     <!-- Incoming -->

     <rm:provider componentTypes="osgi.bundle" readerType="local">

       <rm:uri format="{0}/incoming/{1}">

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
index 0608dbe07d5..feb903cdc06 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
@@ -258,6 +258,12 @@
         <bc:propertyRef key="buckminster.component"/>

       </rm:uri>

     </rm:provider>

+    <rm:provider componentTypes="osgi.bundle" readerType="local">

+      <rm:uri format="{0}/plugins/views/validation/{1}">

+        <bc:propertyRef key="local.repository"/>

+        <bc:propertyRef key="buckminster.component"/>

+      </rm:uri>

+    </rm:provider>

     

     <!-- EPF -->