Skip to content

Commit

Permalink
[213042] Split zest.tests into zest.tests and zest.examples.
Browse files Browse the repository at this point in the history
- Split zest.tests bundle into zest.tests and zest.examples bundles
(which is undeployed).
- Ensured zest.tests, zest.examples, and zest.doc.isv bundles share the
overall zest/zest.sdk feature version, which has been increased to 1.7.0
in this context.
- Increased GEF-ALL feature version to 3.11.0 to reflect minor increase
in zest.sdk feature.
  • Loading branch information
nyssen committed Sep 5, 2015
1 parent 263ac38 commit adbe652
Show file tree
Hide file tree
Showing 94 changed files with 838 additions and 204 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.draw2d.examples/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.draw2d.examples
Bundle-Version: 3.10.0.qualifier
Bundle-Version: 3.10.100.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)"
Bundle-Vendor: %Plugin.providerName
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.gef.all-feature/feature.xml
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.gef.all"
label="%featureName"
version="3.10.100.qualifier"
version="3.11.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.gef"
image="eclipse_update_120.jpg"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.gef.all-feature/pom.xml
Expand Up @@ -11,6 +11,6 @@
</parent>
<groupId>org.eclipse.gef.features</groupId>
<artifactId>org.eclipse.gef.all</artifactId>
<version>3.10.100-SNAPSHOT</version>
<version>3.11.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
8 changes: 4 additions & 4 deletions org.eclipse.gef.repository/category.xml
Expand Up @@ -12,7 +12,7 @@
<feature url="features/org.eclipse.gef_3.10.100.qualifier.jar" id="org.eclipse.gef" version="3.10.100.qualifier">
<category name="GEF"/>
</feature>
<feature url="features/org.eclipse.gef.all_3.10.100.qualifier.jar" id="org.eclipse.gef.all" version="3.10.100.qualifier">
<feature url="features/org.eclipse.gef.all_3.11.0.qualifier.jar" id="org.eclipse.gef.all" version="3.11.0.qualifier">
<category name="GEF"/>
</feature>
<feature url="features/org.eclipse.gef.examples_3.10.100.qualifier.jar" id="org.eclipse.gef.examples" version="3.10.100.qualifier">
Expand All @@ -27,13 +27,13 @@
<feature url="features/org.eclipse.gef.source_3.10.100.qualifier.jar" id="org.eclipse.gef.source" version="3.10.100.qualifier">
<category name="GEF"/>
</feature>
<feature url="features/org.eclipse.zest_1.6.100.qualifier.jar" id="org.eclipse.zest" version="1.6.100.qualifier">
<feature url="features/org.eclipse.zest_1.7.0.qualifier.jar" id="org.eclipse.zest" version="1.7.0.qualifier">
<category name="GEF"/>
</feature>
<feature url="features/org.eclipse.zest.sdk_1.6.100.qualifier.jar" id="org.eclipse.zest.sdk" version="1.6.100.qualifier">
<feature url="features/org.eclipse.zest.sdk_1.7.0.qualifier.jar" id="org.eclipse.zest.sdk" version="1.7.0.qualifier">
<category name="GEF"/>
</feature>
<feature url="features/org.eclipse.zest.source_1.6.100.qualifier.jar" id="org.eclipse.zest.source" version="1.6.100.qualifier">
<feature url="features/org.eclipse.zest.source_1.7.0.qualifier.jar" id="org.eclipse.zest.source" version="1.7.0.qualifier">
<category name="GEF"/>
</feature>
<category-def name="GEF" label="GEF (Graphical Editing Framework)">
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.zest-feature/feature.xml
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.zest"
label="%featureName"
version="1.6.100.qualifier"
version="1.7.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.zest.core"
image="eclipse_update_120.jpg"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.zest-feature/pom.xml
Expand Up @@ -11,6 +11,6 @@
</parent>
<groupId>org.eclipse.zest.features</groupId>
<artifactId>org.eclipse.zest</artifactId>
<version>1.6.100-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion org.eclipse.zest.doc.isv/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.zest.doc.isv; singleton:=true
Bundle-Version: 1.5.300.qualifier
Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Eclipse-LazyStart: true
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.zest.doc.isv/pom.xml
Expand Up @@ -11,7 +11,7 @@
</parent>
<groupId>org.eclipse.zest.plugins</groupId>
<artifactId>org.eclipse.zest.doc.isv</artifactId>
<version>1.5.300-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
Expand Down
11 changes: 11 additions & 0 deletions org.eclipse.zest.examples/.classpath
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="**/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 2 additions & 0 deletions org.eclipse.zest.examples/.gitignore
@@ -0,0 +1,2 @@
/target
/bin
34 changes: 34 additions & 0 deletions org.eclipse.zest.examples/.project
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.zest.examples</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<session version="1.0">
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original element: 'org.eclipse.mylyn.zest.tests/src/icons'" description="Delete element" element1="/src&lt;icons" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1188345138703" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.actions'" description="Delete element" element1="/src&lt;org.eclipse.mylyn.zest.tests.actions" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1188345144093" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.views'" description="Delete element" element1="/src&lt;org.eclipse.mylyn.zest.tests.views" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1188345146375" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 12 element(s) from project 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original elements:&#13;&#10; org.eclipse.mylyn.zest.tests.GraphContentProvider.java&#13;&#10; org.eclipse.mylyn.zest.tests.GraphEntityContentProvider.java&#13;&#10; org.eclipse.mylyn.zest.tests.GraphLabelProvider.java&#13;&#10; org.eclipse.mylyn.zest.tests.JavaHierarchyContentProvider.java&#13;&#10; org.eclipse.mylyn.zest.tests.NestedGraphEntityContentProvider.java&#13;&#10; org.eclipse.mylyn.zest.tests.NestedGraphLabelProvider.java&#13;&#10; org.eclipse.mylyn.zest.tests.SampleNestedView.java&#13;&#10; org.eclipse.mylyn.zest.tests.SamplePlugin.java&#13;&#10; org.eclipse.mylyn.zest.tests.SampleTimeLineView.java&#13;&#10; org.eclipse.mylyn.zest.tests.SampleView.java&#13;&#10; org.eclipse.mylyn.zest.tests.StaticZestView.java&#13;&#10; org.eclipse.mylyn.zest.tests.ZestImages.java" description="Delete elements" element1="/src&lt;org.eclipse.mylyn.zest.tests{SampleTimeLineView.java" element10="/src&lt;org.eclipse.mylyn.zest.tests{SampleNestedView.java" element11="/src&lt;org.eclipse.mylyn.zest.tests{GraphEntityContentProvider.java" element12="/src&lt;org.eclipse.mylyn.zest.tests{GraphLabelProvider.java" element2="/src&lt;org.eclipse.mylyn.zest.tests{NestedGraphEntityContentProvider.java" element3="/src&lt;org.eclipse.mylyn.zest.tests{StaticZestView.ja" element4="/src&lt;org.eclipse.mylyn.zest.tests{StaticZestView.java" element5="/src&lt;org.eclipse.mylyn.zest.tests{SampleView.javantentProvider.java" element6="/src&lt;org.eclipse.mylyn.zest.tests{SampleView.java" element7="/src&lt;org.eclipse.mylyn.zest.tests{GraphContentProvider.javajava" element8="/src&lt;org.eclipse.mylyn.zest.tests{GraphContentProvider.java" element9="/src&lt;org.eclipse.mylyn.zest.tests{ZestImages.java" elements="12" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1188345150500" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.swt'" description="Delete element" element1="/src&lt;org.eclipse.mylyn.zest.swt" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1188345237109" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.uml'" description="Delete element" element1="/src&lt;org.eclipse.mylyn.zest.uml" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1188345241234" subPackages="false" version="1.0"/>
<refactoring comment="Move 6 elements(s) to 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.jface'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Destination element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.jface'&#13;&#10;- Original elements:&#13;&#10; org.eclipse.mylyn.zest.examples.jface.GraphJFaceSnippet3.java&#13;&#10; org.eclipse.mylyn.zest.examples.jface.GraphJFaceSnippet1.java&#13;&#10; org.eclipse.mylyn.zest.examples.jface.GraphJFaceSnippet4.java&#13;&#10; org.eclipse.mylyn.zest.examples.jface.GraphJFaceSnippet5.java&#13;&#10; org.eclipse.mylyn.zest.examples.jface.GraphJFaceSnippet2.java&#13;&#10; SimpleGraph.sgf&#13;&#10;- Update references to refactored element" description="Move elements" destination="/src&lt;org.eclipse.mylyn.zest.tests.jface" element1="src/org/eclipse/mylyn/zest/examples/jface/SimpleGraph.sgf" element2="/src&lt;org.eclipse.mylyn.zest.examples.jface{GraphJFaceSnippet3.java" element3="/src&lt;org.eclipse.mylyn.zest.examples.jface{GraphJFaceSnippet1.java" element4="/src&lt;org.eclipse.mylyn.zest.examples.jface{GraphJFaceSnippet4.java" element5="/src&lt;org.eclipse.mylyn.zest.examples.jface{GraphJFaceSnippet5.java" element6="/src&lt;org.eclipse.mylyn.zest.examples.jface{GraphJFaceSnippet2.java" files="1" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" policy="org.eclipse.jdt.ui.moveResources" qualified="false" references="true" stamp="1188345277093" units="5" version="1.0"/>
<refactoring comment="Move 13 elements(s) to 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.swt'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Destination element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.swt'&#13;&#10;- Original elements:&#13;&#10; org.eclipse.mylyn.zest.examples.swt.NestedGraphSnippet.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.GraphSnippet4.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.GraphSnippet3.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.GraphSnippet6.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.GraphSnippet2.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.GraphSnippet5.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.HelloWorld.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.NestedGraphSnippet2.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.GraphSnippet1.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.ZoomSnippet.java&#13;&#10; org.eclipse.mylyn.zest.examples.swt.PaintSnippet.java&#13;&#10; package_obj.gif&#13;&#10; class_obj.gif&#13;&#10;- Update references to refactored element" description="Move elements" destination="/src&lt;org.eclipse.mylyn.zest.tests.swt" element1="src/org/eclipse/mylyn/zest/examples/swt/package_obj.gif" element10="/src&lt;org.eclipse.mylyn.zest.examples.swt{NestedGraphSnippet2.java" element11="/src&lt;org.eclipse.mylyn.zest.examples.swt{GraphSnippet1.java" element12="/src&lt;org.eclipse.mylyn.zest.examples.swt{ZoomSnippet.java" element13="/src&lt;org.eclipse.mylyn.zest.examples.swt{PaintSnippet.java" element2="src/org/eclipse/mylyn/zest/examples/swt/class_obj.gif" element3="/src&lt;org.eclipse.mylyn.zest.examples.swt{NestedGraphSnippet.java" element4="/src&lt;org.eclipse.mylyn.zest.examples.swt{GraphSnippet4.java" element5="/src&lt;org.eclipse.mylyn.zest.examples.swt{GraphSnippet3.java" element6="/src&lt;org.eclipse.mylyn.zest.examples.swt{GraphSnippet6.java" element7="/src&lt;org.eclipse.mylyn.zest.examples.swt{GraphSnippet5.java" element8="/src&lt;org.eclipse.mylyn.zest.examples.swt{GraphSnippet5.java" element9="org.ecli.eclipse.mylyn.zest.examples.swt{HelloWorld.java" files="2" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" policy="org.eclipse.jdt.ui.moveResources" qualified="false" references="true" stamp="1188345288218" units="11" version="1.0"/>
<refactoring comment="Move 6 elements(s) to 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.uml'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Destination element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.uml'&#13;&#10;- Original elements:&#13;&#10; org.eclipse.mylyn.zest.examples.uml.UMLExample.java&#13;&#10; org.eclipse.mylyn.zest.examples.uml.CompartmentFigure.java&#13;&#10; org.eclipse.mylyn.zest.examples.uml.UMLClassFigure.java&#13;&#10; methpub_obj.gif&#13;&#10; field_private_obj.gif&#13;&#10; class_obj.gif&#13;&#10;- Update references to refactored element" description="Move elements" destination="/src&lt;org.eclipse.mylyn.zest.tests.uml" element1="src/org/eclipse/mylyn/zest/examples/uml/methpub_obj.gif" element2="src/org/eclipse/mylyn/zest/examples/uml/field_private_obj.gif" element3="src/org/eclipse/mylyn/zest/examples/uml/class_obj.gif" element4="/src&lt;org.eclipse.mylyn.zest.examples.uml{UMLExample.java" element5="/src&lt;org.eclipse.mylyn.zest.examples.uml{CompartmentFigure.java" element6="/src&lt;org.eclipse.mylyn.zest.examples.uml{UMLClassFigure.java" files="3" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" policy="org.eclipse.jdt.ui.moveResources" qualified="false" references="true" stamp="1188345297578" units="3" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#13;&#10;- Original element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.examples'&#13;&#10;- Delete subpackages" description="Delete element" element1="/src&lt;org.eclipse.mylyn.zest.examples.uml" element2="/src&lt;org.eclipse.mylyn.zest.examples.swt" element3="/src&lt;org.eclipse.mylyn.zest.examples.jface" element4="/src&lt;org.eclipse.mylyn.zest.examples" elements="4" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1188345300312" subPackages="true" version="1.0"/>
<refactoring comment="Copy 1 elements(s) to 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.swt'&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#10;- Destination element: 'org.eclipse.mylyn.zest.tests/src/org.eclipse.mylyn.zest.tests.swt'&#10;- Original element: 'org.eclipse.mylyn.zest.tests.swt.GraphSnippet7.java'" description="Copy compilation unit" destination="/src&lt;org.eclipse.mylyn.zest.tests.swt" element1="/src&lt;org.eclipse.mylyn.zest.tests.swt{GraphSnippet7.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.copy" log="/src&lt;org.eclipse.mylyn.zest.tests.swt{GraphSnippet7.java&#9;true&#9;true&#9;LayoutExample.java" policy="org.eclipse.jdt.ui.copyResources" stamp="1188591906513" units="1" version="1.0"/>
<refactoring comment="Extract local variable 'springLayoutAlgorithm' from expression 'new SpringLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING)'&#10;- Original project: 'org.eclipse.mylyn.zest.tests'&#10;- Variable name: 'springLayoutAlgorithm'&#10;- Destination method: 'org.eclipse.mylyn.zest.tests.swt.LayoutExample.main()'&#10;- Variable expression: 'new SpringLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING)'&#10;- Replace occurrences of expression with variable" description="Extract local variable 'springLayoutAlgorithm'" final="false" id="org.eclipse.jdt.ui.extract.temp" input="/src&lt;org.eclipse.mylyn.zest.tests.swt{LayoutExample.java" name="springLayoutAlgorithm" replace="true" selection="1936 63" stamp="1188592193737" version="1.0"/>
</session>
@@ -0,0 +1,12 @@
1188345138703 Delete element
1188345144093 Delete element
1188345146375 Delete element
1188345150500 Delete elements
1188345237109 Delete element
1188345241234 Delete element
1188345277093 Move elements
1188345288218 Move elements
1188345297578 Move elements
1188345300312 Delete element
1188591906513 Copy compilation unit
1188592193737 Extract local variable 'springLayoutAlgorithm'

0 comments on commit adbe652

Please sign in to comment.