Naming fixes.

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22287 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.g3d.csg/META-INF/MANIFEST.MF b/org.simantics.g3d.csg/META-INF/MANIFEST.MF
index a33e4ac76e9aaf63a6521a4b600b94ebfb3f6d0b..022906c76a8581b7aa06b5f060d470e5b97d7795 100644 (file)
--- a/org.simantics.g3d.csg/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.csg/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Activator: org.simantics.proconf.g3d.csg.Activator
 Bundle-Vendor: VTT Technical Research Center of Finland
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.simantics.proconf.g3d,
  org.simantics.db,
+ org.simantics.g3d;bundle-version="0.0.1",
  org.simantics.layer0.utils,
- org.simantics.layer0.stubs,
+ org.simantics.layer0;bundle-version="1.0.0",
  org.simantics.utils.datastructures,
  org.simantics.animation
 ipse-LazyStart: true

diff --git a/org.simantics.g3d.feature/feature.xml b/org.simantics.g3d.feature/feature.xml
index 80382ebdc4e6bd3dab3b1067f69bf0592c8bfcff..af552055a39636e9bb496caefcbc3501cdea02eb 100644 (file)
--- a/org.simantics.g3d.feature/feature.xml
+++ b/org.simantics.g3d.feature/feature.xml
@@ -18,14 +18,14 @@
    </license>\r
 \r
    <plugin\r
-         id="org.simantics.proconf.g3d"\r
+         id="org.simantics.g3d"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.proconf.g3d.occ"\r
+         id="org.simantics.g3d.occ"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
@@ -59,14 +59,14 @@
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.proconf.g3d.csg"\r
+         id="org.simantics.g3d.csg"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
 \r
    <plugin\r
-         id="org.simantics.proconf.g3d.shapeeditor"\r
+         id="org.simantics.g3d.shapeeditor"\r
          download-size="0"\r
          install-size="0"\r
          version="0.0.0"\r

diff --git a/org.simantics.g3d.occ/META-INF/MANIFEST.MF b/org.simantics.g3d.occ/META-INF/MANIFEST.MF
index 5e5fd6d14311b2cf26c7d08a407f0b1cdb647f59..cb348921df379577107d3f2dc10b712887efabcf 100644 (file)
--- a/org.simantics.g3d.occ/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.occ/META-INF/MANIFEST.MF
@@ -7,15 +7,15 @@ Bundle-Activator: org.simantics.proconf.g3d.occ.Activator
 Bundle-Vendor: VTT Technical Research Center of Finland
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.simantics.proconf.g3d,
+ org.simantics.g3d;bundle-version="0.0.1",
+ org.simantics.g3d.csg;bundle-version="0.0.1",
  com.jme.eclipse,
  javax.vecmath,
  org.jcae.opencascade.jni,
  org.simantics.db,
- org.simantics.layer0.stubs,
+ org.simantics.db.layer0;bundle-version="1.1.0",
  org.simantics.layer0.utils,
  org.simantics.utils,
- org.simantics.proconf.ui,
- org.simantics.proconf.g3d.csg
+ org.simantics.ui;bundle-version="1.0.0"
 Eclipse-LazyStart: true
 Export-Package: org.simantics.proconf.g3d.occ.geometry

diff --git a/org.simantics.g3d.shapeeditor/META-INF/MANIFEST.MF b/org.simantics.g3d.shapeeditor/META-INF/MANIFEST.MF
index 7202aece87e08bdbcfdaff631beabae549e021e8..7301aaf57406c211934f859ed0891ce6c4727596 100644 (file)
--- a/org.simantics.g3d.shapeeditor/META-INF/MANIFEST.MF
+++ b/org.simantics.g3d.shapeeditor/META-INF/MANIFEST.MF
@@ -11,13 +11,11 @@ Require-Bundle: org.eclipse.ui,
  com.jme.eclipse,
  javax.vecmath,
  org.jcae.opencascade.jni,
- org.simantics.proconf.g3d,
  org.simantics.image.stubs,
- org.simantics.layer0.stubs,
+ org.simantics.db.layer0;bundle-version="1.1.0",
  org.simantics.layer0.utils,
  org.simantics.utils,
- org.simantics.proconf.g3d.occ,
- org.simantics.proconf.ui,
+ org.simantics.ui;bundle-version="1.0.0",
  org.simantics.animation,
  org.simantics.proconf.ode,
  org.simantics.utils.ui,
@@ -26,6 +24,8 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.utils.ui.workbench,
  org.simantics.proconf.browsing,
  org.simantics.db.services,
- org.simantics.proconf.g3d.csg
+ org.simantics.g3d;bundle-version="0.0.1",
+ org.simantics.g3d.csg;bundle-version="0.0.1",
+ org.simantics.g3d.occ;bundle-version="0.0.1"
 Eclipse-LazyStart: true
 Export-Package: org.simantics.proconf.g3d.shapeeditor.views

diff --git a/org.simantics.g3d.shapeeditor/plugin.xml b/org.simantics.g3d.shapeeditor/plugin.xml
index e54575c4a661aea5555b85eed9a39cdefcc119cf..fbb5a4e25327c572a9b140f79a056d7c190dca86 100644 (file)
--- a/org.simantics.g3d.shapeeditor/plugin.xml
+++ b/org.simantics.g3d.shapeeditor/plugin.xml
@@ -54,7 +54,7 @@
       </menuContribution>\r
    </extension>\r
    <extension\r
-         point="org.simantics.proconf.ui.resourceEditorAdapter">\r
+         point="org.simantics.ui.resourceEditorAdapter">\r
       <adapterClass\r
             class="org.simantics.proconf.g3d.shapeeditor.handlers.ResourceEditorAdapter1"\r
             id="org.simantics.proconf.shapeeditor.ResourceEditorDescription1">\r
@@ -157,7 +157,7 @@
       </context>\r
    </extension>\r
    <extension\r
-         point="org.simantics.proconf.ui.perspectiveContextBinding">\r
+         point="org.simantics.ui.perspectiveContextBinding">\r
       <binding\r
             contextIds="org.simantics.proconf.shapeeditor.csg"\r
             perspectiveId="org.simantics.proconf.shapeeditor.perspectives.csg">\r