tidy up some remaining cauldron references


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@820571 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/help/Activator.java b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/help/Activator.java
index 4fe71c2..6aea34a 100644
--- a/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/help/Activator.java
+++ b/sigil/eclipse/help/src/org/apache/felix/sigil/eclipse/help/Activator.java
@@ -31,7 +31,7 @@
 {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.cauldron.sigil.help";
+    public static final String PLUGIN_ID = "org.apache.felix.sigil.eclipse.help";
 
     // The shared instance
     private static Activator plugin;
diff --git a/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java b/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
index 3de91c3..051484d 100644
--- a/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
+++ b/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
@@ -31,7 +31,7 @@
 {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.cauldron.sigil.obr";
+    public static final String PLUGIN_ID = "org.apache.felix.sigil.eclipse.obr";
 
     // The shared instance
     private static Activator plugin;
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
index 675222b..3ccfee2 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
@@ -45,7 +45,7 @@
 {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.cauldron.sigil.ui";
+    public static final String PLUGIN_ID = "org.apache.felix.sigil.eclipse.ui";
 
     public static final String REPOSITORY_WIZARD_EXTENSION_POINT_ID = "org.apache.felix.sigil.ui.repositorywizard";
 
diff --git a/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
index 64ec5df..f2be586 100644
--- a/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
+++ b/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
@@ -103,9 +103,7 @@
         layout.addNewWizardShortcut( "org.eclipse.ui.wizards.new.file" );//$NON-NLS-1$
         layout.addNewWizardShortcut( "org.eclipse.ui.editors.wizards.UntitledTextFileWizard" );//$NON-NLS-1$
 
-        layout.addNewWizardShortcut( "org.cauldron.sigil.editors.newCompositeWizard" );
-        layout.addNewWizardShortcut( "org.cauldron.sigil.editors.newSystemWizard" );
-        layout.addNewWizardShortcut( "org.cauldron.sigil.editors.newProjectWizard" );
+        layout.addNewWizardShortcut( "org.apache.felix.sigil.editors.newProjectWizard" );
     }
 
 }