[535490] Use clone of EMF library example
diff --git a/doc/org.eclipse.ocl.doc/doc/4200-oclinterpreter-tutorial.textile b/doc/org.eclipse.ocl.doc/doc/4200-oclinterpreter-tutorial.textile
index 159370f..53051c3 100644
--- a/doc/org.eclipse.ocl.doc/doc/4200-oclinterpreter-tutorial.textile
+++ b/doc/org.eclipse.ocl.doc/doc/4200-oclinterpreter-tutorial.textile
@@ -371,12 +371,12 @@
<ocl.ecore:PropertyCallExp xmi:id="_897fVPfmEduCQ48h829a5g">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="ocl.ecore:VariableExp" xmi:id="_897fVvfmEduCQ48h829a5g" name="self" referredVariable="_897fUvfmEduCQ48h829a5g">
- <eType xsi:type="ecore:EClass" href="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0#//Book"/>
+ <eType xsi:type="ecore:EClass" href="http://www.org.eclipse/ocl/examples/library/extlibrary.ecore/1.0.0#//Book"/>
</source>
- <referredProperty xsi:type="ecore:EAttribute" href="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0#//Book/title"/>
+ <referredProperty xsi:type="ecore:EAttribute" href="http://www.org.eclipse/ocl/examples/library/extlibrary.ecore/1.0.0#//Book/title"/>
</ocl.ecore:PropertyCallExp>
<ocl.ecore:Variable xmi:id="_897fUvfmEduCQ48h829a5g" name="self">
- <eType xsi:type="ecore:EClass" href="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0#//Book"/>
+ <eType xsi:type="ecore:EClass" href="http://www.org.eclipse/ocl/examples/library/extlibrary.ecore/1.0.0#//Book"/>
</ocl.ecore:Variable>
</xmi:XMI>
p.
diff --git a/doc/org.eclipse.ocl.doc/references/6320-extlibrary.ocl b/doc/org.eclipse.ocl.doc/references/6320-extlibrary.ocl
index 4efc0b3..9b04a50 100644
--- a/doc/org.eclipse.ocl.doc/references/6320-extlibrary.ocl
+++ b/doc/org.eclipse.ocl.doc/references/6320-extlibrary.ocl
@@ -1,4 +1,4 @@
-import 'http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0'
+import 'http://www.org.eclipse/ocl/examples/library/extlibrary.ecore/1.0.0'
package extlibrary
diff --git a/examples/org.eclipse.ocl.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples/META-INF/MANIFEST.MF
index 7760ece..d60967d 100644
--- a/examples/org.eclipse.ocl.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ocl.examples;singleton:=true
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.13.0.qualifier
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
diff --git a/examples/org.eclipse.ocl.examples/buildZips.xml b/examples/org.eclipse.ocl.examples/buildZips.xml
index 1babf91..bb2cf9f 100644
--- a/examples/org.eclipse.ocl.examples/buildZips.xml
+++ b/examples/org.eclipse.ocl.examples/buildZips.xml
@@ -9,6 +9,11 @@
<target name="zip.examples" depends="init">
<!-- OCL examples -->
+ <!--eclipse.convertPath resourcePath="org.eclipse.ocl.examples.extlibrary" property="projectDir"/-->
+ <zip destfile="zips/extlibrary.zip" basedir="../org.eclipse.ocl.examples.extlibrary">
+ <patternset refid="zip.excludes"/>
+ </zip>
+
<!--eclipse.convertPath resourcePath="org.eclipse.ocl.examples.interpreter" property="projectDir"/-->
<zip destfile="zips/interpreter.zip" basedir="../org.eclipse.ocl.examples.interpreter">
<patternset refid="zip.excludes"/>
diff --git a/examples/org.eclipse.ocl.examples/plugin.properties b/examples/org.eclipse.ocl.examples/plugin.properties
index 4d596a6..7a561f9 100644
--- a/examples/org.eclipse.ocl.examples/plugin.properties
+++ b/examples/org.eclipse.ocl.examples/plugin.properties
@@ -30,11 +30,14 @@
OCL_category=OCL (Object Constraint Language) Plug-ins
+OCL_ExtLibrary_name=OCL Extended Library
+OCL_ExtLibrary_description=Example extended library project (local clone of EMF's variant)
+
OCL_Interpreter_name=OCL Interpreter
OCL_Interpreter_description=Example project defining an interactive OCL interpreter console
-_UI_LibraryModelProject_desc = This project contains the extended library model and the implementation generated from it.
-_UI_LibraryEditProject_desc = This project contains the item providers generated to support viewing and editing instances of the extended library model.
-_UI_LibraryEditorProjector_desc = This project contains the sample editor generated from the extended library model.
+#_UI_LibraryModelProject_desc = This project contains the extended library model and the implementation generated from it.
+#_UI_LibraryEditProject_desc = This project contains the item providers generated to support viewing and editing instances of the extended library model.
+#_UI_LibraryEditorProjector_desc = This project contains the sample editor generated from the extended library model.
CompleteOCL_Tutorial_name=Complete OCL Tutorial
CompleteOCL_Tutorial_description=Tutorial example demonstrating use of independent OCL to complement Ecore or UML models or Xtext grammars
diff --git a/examples/org.eclipse.ocl.examples/plugin.xml b/examples/org.eclipse.ocl.examples/plugin.xml
index e1fdd36..0c04401 100644
--- a/examples/org.eclipse.ocl.examples/plugin.xml
+++ b/examples/org.eclipse.ocl.examples/plugin.xml
@@ -19,6 +19,14 @@
<category id="org.eclipse.ocl.examples.category"
name="%OCL_category"
parentCategory="org.eclipse.ui.Examples"/>
+ <wizard id="org.eclipse.ocl.examples.extlibrary"
+ category="org.eclipse.ui.Examples/org.eclipse.ocl.examples.category"
+ class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard"
+ project="true"
+ name="%OCL_ExtLibrary_name"
+ icon="$nl$/icons/elcl16/oclconsole_co.gif">
+ <description>%OCL_ExtLibrary_description</description>
+ </wizard>
<wizard id="org.eclipse.ocl.examples.interpreter"
category="org.eclipse.ui.Examples/org.eclipse.ocl.examples.category"
class="org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard"
@@ -77,21 +85,28 @@
contentURI="zips/empty.zip"
description="%EmptyOCL_description"/>
</example>
+ <example id="org.eclipse.ocl.examples.project.EXTlibrary"
+ wizardID="org.eclipse.ocl.examples.extlibrary"
+ pageImage="$nl$/icons/elcl16/oclconsole_co.gif">
+ <projectDescriptor name="org.eclipse.ocl.examples.extlibrary"
+ contentURI="zips/extlibrary.zip"
+ description="%OCL_Interpreter_description"/>
+ </example>
<example id="org.eclipse.ocl.examples.project.Interpreter"
wizardID="org.eclipse.ocl.examples.interpreter"
pageImage="$nl$/icons/elcl16/oclconsole_co.gif">
<projectDescriptor name="org.eclipse.ocl.examples.project.interpreter"
contentURI="zips/interpreter.zip"
description="%OCL_Interpreter_description"/>
- <projectDescriptor name="org.eclipse.emf.examples.library"
- contentURI="zips/library.zip"
- description="%_UI_LibraryModelProject_desc"/>
- <projectDescriptor name="org.eclipse.emf.examples.library.edit"
+ <projectDescriptor name="org.eclipse.ocl.examples.extlibrary"
+ contentURI="zips/extlibrary.zip"
+ description="%OCL_ExtLibrary_description"/>
+ <!--projectDescriptor name="org.eclipse.emf.examples.library.edit"
contentURI="zips/libraryEdit.zip"
description="%_UI_LibraryEditProject_desc"/>
<projectDescriptor name="org.eclipse.emf.examples.library.editor"
contentURI="zips/libraryEditor.zip"
- description="%_UI_LibraryEditorProjector_desc"/>
+ description="%_UI_LibraryEditorProjector_desc"/-->
</example>
<example id="org.eclipse.ocl.examples.project.OCLinEcore"
wizardID="org.eclipse.ocl.examples.oclinecoretutorial"
diff --git a/examples/org.eclipse.ocl.examples/pom.xml b/examples/org.eclipse.ocl.examples/pom.xml
index 522c250..deddbd4 100644
--- a/examples/org.eclipse.ocl.examples/pom.xml
+++ b/examples/org.eclipse.ocl.examples/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ocl</groupId>
<artifactId>org.eclipse.ocl.examples</artifactId>
- <version>3.10.400-SNAPSHOT</version>
+ <version>3.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.eclipse.ocl</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 5543a05..20811c0 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,6 +24,7 @@
<module>org.eclipse.ocl.examples.emf.validation.validity</module>
<module>org.eclipse.ocl.examples.emf.validation.validity.ui</module>
<module>org.eclipse.ocl.examples.eventmanager</module>
+ <module>org.eclipse.ocl.examples.extlibrary</module>
<module>org.eclipse.ocl.examples.impactanalyzer</module>
<module>org.eclipse.ocl.examples.impactanalyzer.ui</module>
<module>org.eclipse.ocl.examples.impactanalyzer.util</module>
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
index 87ca66b..553b759 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@
org.eclipse.debug.ui;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.codegen.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.examples.library;bundle-version="[2.5.0,3.0.0)",
org.eclipse.uml2.codegen.ecore;bundle-version="[1.7.0,3.0.0)",
org.eclipse.uml2.uml.resources;bundle-version="[5.0.0,6.0.0)",
org.eclipse.uml2.uml.editor;bundle-version="[5.0.0,6.0.0)",
@@ -26,6 +25,7 @@
org.eclipse.ocl.xtext.completeocl.ui,
org.eclipse.ocl.examples.xtext.console,
org.eclipse.ocl.xtext.oclstdlib.ui,
+ org.eclipse.ocl.examples.extlibrary,
org.eclipse.ocl.examples.uml25;resolution:=optional,
org.eclipse.ocl.examples.standalone,
org.eclipse.ocl.examples.emf.validation.validity,
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/PivotDocumentationExamples.extlibrary b/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/PivotDocumentationExamples.extlibrary
index e4d4a2c..53c9a26 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/PivotDocumentationExamples.extlibrary
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/PivotDocumentationExamples.extlibrary
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<extlib:Library xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extlib="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0" name="myLibrary">
+<extlib:Library xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extlib="http://www.org.eclipse/ocl/examples/library/extlibrary.ecore/1.0.0" name="myLibrary">
<stock xsi:type="extlib:Book" title="First Book"/>
<stock xsi:type="extlib:Book" title="Second Book"/>
</extlib:Library>
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/parsingDocumentsExample.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/parsingDocumentsExample.ocl
index b3ff7ff..0d1f123 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/parsingDocumentsExample.ocl
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/models/documentation/parsingDocumentsExample.ocl
@@ -1,5 +1,5 @@
--import 'platform:/resource/org.eclipse.emf.examples.library/model/extlibrary.ecore'
-import 'http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0'
+import 'http://www.org.eclipse/ocl/examples/library/extlibrary.ecore/1.0.0'
package extlibrary
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java
index 1775c47..427dc67 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java
@@ -50,12 +50,12 @@
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.util.QueryDelegate;
import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
-import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;
-import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
-import org.eclipse.emf.examples.extlibrary.Library;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.common.OCLConstants;
import org.eclipse.ocl.common.internal.options.CommonOptions;
+import org.eclipse.ocl.examples.extlibrary.EXTLibraryFactory;
+import org.eclipse.ocl.examples.extlibrary.EXTLibraryPackage;
+import org.eclipse.ocl.examples.extlibrary.Library;
import org.eclipse.ocl.examples.xtext.tests.TestCaseAppender;
import org.eclipse.ocl.examples.xtext.tests.TestUtil;
import org.eclipse.ocl.examples.xtext.tests.XtextVersionUtil;
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java
index b95cefd..3161062 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java
@@ -37,12 +37,12 @@
import org.eclipse.emf.ecore.util.Diagnostician;
import org.eclipse.emf.ecore.util.EObjectValidator;
import org.eclipse.emf.edit.ui.EMFEditUIPlugin;
-import org.eclipse.emf.examples.extlibrary.Book;
-import org.eclipse.emf.examples.extlibrary.BookCategory;
-import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;
-import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
-import org.eclipse.emf.examples.extlibrary.Library;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.examples.extlibrary.Book;
+import org.eclipse.ocl.examples.extlibrary.BookCategory;
+import org.eclipse.ocl.examples.extlibrary.EXTLibraryFactory;
+import org.eclipse.ocl.examples.extlibrary.EXTLibraryPackage;
+import org.eclipse.ocl.examples.extlibrary.Library;
import org.eclipse.ocl.examples.xtext.tests.XtextTestCase;
import org.eclipse.ocl.pivot.Constraint;
import org.eclipse.ocl.pivot.ExpressionInOCL;
