You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/07/20 09:53:24 UTC
svn commit: r795713 - in /felix/trunk/sigil/eclipse: core/ core/schema/
core/src/org/apache/felix/sigil/eclipse/ help/ obr/ ui/ ui/schema/ utils/
Author: dsavage
Date: Mon Jul 20 07:53:24 2009
New Revision: 795713
URL: http://svn.apache.org/viewvc?rev=795713&view=rev
Log:
patch for FELIX-1327
Added:
felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.installbuilder.exsd (contents, props changed)
- copied, changed from r795529, felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.runtime.installbuilder.exsd
felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.repositoryprovider.exsd (contents, props changed)
- copied, changed from r795529, felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.repositoryprovider.exsd
felix/trunk/sigil/eclipse/ui/schema/org.apache.felix.sigil.ui.repositorywizard.exsd (props changed)
- copied unchanged from r795529, felix/trunk/sigil/eclipse/ui/schema/org.cauldron.sigil.ui.repositorywizard.exsd
Removed:
felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.repositoryprovider.exsd
felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.runtime.installbuilder.exsd
felix/trunk/sigil/eclipse/ui/schema/org.cauldron.sigil.ui.repositorywizard.exsd
Modified:
felix/trunk/sigil/eclipse/core/plugin.xml
felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
felix/trunk/sigil/eclipse/help/plugin.xml
felix/trunk/sigil/eclipse/obr/plugin.xml
felix/trunk/sigil/eclipse/ui/plugin.xml
felix/trunk/sigil/eclipse/utils/plugin.xml
Modified: felix/trunk/sigil/eclipse/core/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/plugin.xml?rev=795713&r1=795712&r2=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/plugin.xml (original)
+++ felix/trunk/sigil/eclipse/core/plugin.xml Mon Jul 20 07:53:24 2009
@@ -19,27 +19,16 @@
-->
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="org.cauldron.sigil.repositoryprovider" name="Bundle Repository Provider" schema="schema/org.cauldron.sigil.repositoryprovider.exsd"/>
- <extension-point id="org.cauldron.sigil.installbuilder" name="Newton Install Builder" schema="schema/org.cauldron.sigil.runtime.installbuilder.exsd"/>
+ <extension-point id="org.apache.felix.sigil.repositoryprovider" name="Bundle Repository Provider" schema="schema/org.apache.felix.sigil.repositoryprovider.exsd"/>
+ <extension-point id="org.apache.felix.sigil.installbuilder" name="OSGi Install Builder" schema="schema/org.apache.felix.sigil.installbuilder.exsd"/>
<extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- base-type="org.eclipse.core.runtime.text"
- file-extensions="script,nsh"
- id="org.cauldron.sigil.content.NewtonScriptType"
- name="Newton Script"
- priority="normal">
- </content-type>
-
- </extension>
- <extension
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
class="org.apache.felix.sigil.property.SigilPropertyTester"
- id="org.cauldron.sigil.property.NewtonPropertyTester"
- namespace="org.cauldron.sigil"
- properties="isNewtonResource,isCompositeResource,isSystemResource,isScriptResource,isSigilProject"
+ id="org.apache.felix.sigil.property.SigilPropertyTester"
+ namespace="org.apache.felix.sigil"
+ properties="isSigilProject"
type="org.eclipse.core.resources.IResource"/>
</extension>
<extension
@@ -47,7 +36,7 @@
<factory
adaptableType="org.eclipse.core.resources.IFile"
class="org.apache.felix.sigil.eclipse.internal.adapter.FileAdaptorFactory">
- <adapter type="org.cauldron.sigil.model.eclipse.ISigilBundle"/>
+ <adapter type="org.apache.felix.sigil.model.eclipse.ISigilBundle"/>
</factory>
<factory
adaptableType="org.eclipse.core.resources.IProject"
@@ -56,7 +45,7 @@
</factory>
</extension>
<extension
- id="org.cauldron.sigil.core.sigilnature"
+ id="org.apache.felix.sigil.sigilnature"
name="Sigil Nature"
point="org.eclipse.core.resources.natures">
<runtime>
@@ -80,23 +69,23 @@
</initializer>
</extension>
<extension
- point="org.cauldron.sigil.repositoryprovider">
+ point="org.apache.felix.sigil.repositoryprovider">
<provider
class="org.apache.felix.sigil.eclipse.internal.repository.eclipse.WorkspaceRepositoryProvider"
defaultLevel="-3"
dynamic="false"
- id="org.cauldron.sigil.core.workspaceprovider"
+ id="org.apache.felix.sigil.core.workspaceprovider"
type="Workspace Repository">
</provider>
<provider
- class="org.cauldron.bld.core.repository.FileSystemRepositoryProvider"
+ class="org.apache.felix.sigil.core.repository.FileSystemRepositoryProvider"
dynamic="true"
id="org.cauldron.sigil.core.file"
type="File System Repository">
</provider>
</extension>
<extension
- id="org.cauldron.sigil.unresolvedDependencyMarker"
+ id="org.apache.felix.sigil.unresolvedDependencyMarker"
name="Unresolved Dependency"
point="org.eclipse.core.resources.markers">
<persistent
@@ -113,25 +102,25 @@
</attribute>
</extension>
<extension
- id="org.cauldron.sigil.unresolvedDependencyMarker.importPackage"
+ id="org.apache.felix.sigil.unresolvedDependencyMarker.importPackage"
name="Unresolved Import Package"
point="org.eclipse.core.resources.markers">
<persistent
value="true">
</persistent>
<super
- type="org.cauldron.sigil.unresolvedDependencyMarker">
+ type="org.apache.felix.sigil.unresolvedDependencyMarker">
</super>
</extension>
<extension
- id="org.cauldron.sigil.unresolvedDependencyMarker.requireBundle"
+ id="org.apache.felix.sigil.unresolvedDependencyMarker.requireBundle"
name="Unresolve Require Bundle"
point="org.eclipse.core.resources.markers">
<persistent
value="true">
</persistent>
<super
- type="org.cauldron.sigil.unresolvedDependencyMarker">
+ type="org.apache.felix.sigil.unresolvedDependencyMarker">
</super>
</extension>
</plugin>
Copied: felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.installbuilder.exsd (from r795529, felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.runtime.installbuilder.exsd)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.installbuilder.exsd?p2=felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.installbuilder.exsd&p1=felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.runtime.installbuilder.exsd&r1=795529&r2=795713&rev=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.runtime.installbuilder.exsd (original)
+++ felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.installbuilder.exsd Mon Jul 20 07:53:24 2009
@@ -1,27 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.cauldron.sigil.runtime" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.felix.sigil.eclipse.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.cauldron.sigil.runtime" id="org.cauldron.sigil.runtime.installbuilder" name="Newton Install Builder"/>
+ <meta.schema plugin="org.apache.felix.sigil.eclipse.core" id="org.apache.felix.sigil.installbuilder" name="OSGi Install Builder"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -73,7 +55,7 @@
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.cauldron.sigil.install.INewtonInstallBuilder"/>
+ <meta.attribute kind="java" basedOn=":org.apache.felix.sigil.eclipse.install.IOSGiInstallBuilder"/>
</appinfo>
</annotation>
</attribute>
Propchange: felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.installbuilder.exsd
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.repositoryprovider.exsd (from r795529, felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.repositoryprovider.exsd)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.repositoryprovider.exsd?p2=felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.repositoryprovider.exsd&p1=felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.repositoryprovider.exsd&r1=795529&r2=795713&rev=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/schema/org.cauldron.sigil.repositoryprovider.exsd (original)
+++ felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.repositoryprovider.exsd Mon Jul 20 07:53:24 2009
@@ -1,27 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.cauldron.sigil.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.apache.felix.sigil.eclipse.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.cauldron.sigil.core" id="org.cauldron.sigil.repository" name="Sigil Bundle Repository Provider"/>
+ <meta.schema plugin="org.apache.felix.sigil.eclipse.core" id="org.apache.felix.sigil.repository" name="Sigil Bundle Repository Provider"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
@@ -87,7 +69,7 @@
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.cauldron.sigil.repository.IRepositoryProvider"/>
+ <meta.attribute kind="java" basedOn=":org.apache.felix.sigil.repository.IRepositoryProvider"/>
</appinfo>
</annotation>
</attribute>
Propchange: felix/trunk/sigil/eclipse/core/schema/org.apache.felix.sigil.repositoryprovider.exsd
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java?rev=795713&r1=795712&r2=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java Mon Jul 20 07:53:24 2009
@@ -85,41 +85,41 @@
*/
public class SigilCore extends AbstractUIPlugin {
+ private static final String BASE = "org.apache.felix.sigil";
// The plug-in ID
- public static final String PLUGIN_ID = "org.cauldron.sigil.core";
- public static final String NATURE_ID = PLUGIN_ID + ".sigilnature";
- public static final String PREFERENCES_ID = "org.cauldron.sigil.ui.preferences.SigilPreferencePage";
- public static final String OSGI_INSTALLS_PREFERENCES_ID = "org.cauldron.sigil.ui.preferences.osgiInstalls";
- public static final String EXCLUDED_RESOURCES_PREFERENCES_ID = "org.cauldron.sigil.ui.preferences.excludedResources";
- public static final String REPOSITORIES_PREFERENCES_ID = "org.cauldron.sigil.ui.preferences.repositoriesPreferencePage";
- public static final String OSGI_SCRIPT_TYPE = "org.cauldron.sigil.content.OSGiScriptType";
+ public static final String PLUGIN_ID = BASE + ".eclipse.core";
+ public static final String NATURE_ID = BASE + ".sigilnature";
+ public static final String PREFERENCES_ID = BASE + ".ui.preferences.SigilPreferencePage";
+ public static final String OSGI_INSTALLS_PREFERENCES_ID = BASE + ".ui.preferences.osgiInstalls";
+ public static final String EXCLUDED_RESOURCES_PREFERENCES_ID = BASE + ".ui.preferences.excludedResources";
+ public static final String REPOSITORIES_PREFERENCES_ID = BASE + ".ui.preferences.repositoriesPreferencePage";
public static final String SIGIL_PROJECT_FILE = IBldProject.PROJECT_FILE;
public static final String BUILDER_ID = PLUGIN_ID + ".sigilBuilder";
- public static final String CLASSPATH_CONTAINER_PATH = PLUGIN_ID + ".classpathContainer";
+ public static final String CLASSPATH_CONTAINER_PATH = BASE + ".classpathContainer";
- public static final String OSGI_INSTALLS = "org.cauldron.osgi.installs";
- public static final String OSGI_DEFAULT_INSTALL_ID = "org.cauldron.osgi.default.install.id";
- public static final String OSGI_INSTALL_PREFIX = "org.cauldron.osgi.install.";
- public static final String OSGI_SOURCE_LOCATION = "org.cauldron.osgi.source.location";
- public static final String OSGI_INSTALL_CHECK_PREFERENCE = "org.cauldron.osgi.install.check";
- public static final String LIBRARY_KEYS_PREF = "org.cauldron.osgi.library.keys";
- public static final String PREFERENCES_REBUILD_PROJECTS = "org.cauldron.sigil.rebuild.projects";
- public static final String QUALIFY_VERSIONS = "org.cauldron.sigil.qualify.versions";
-
- public static final String DEFAULT_VERSION_LOWER_BOUND = "org.cauldron.sigil.versionLowerBound";
- public static final String DEFAULT_VERSION_UPPER_BOUND = "org.cauldron.sigil.versionUpperBound";
-
- public static final String DEFAULT_EXCLUDED_RESOURCES = "org.cauldron.sigil.excludedResources";
- public static final String PREFERENCES_NOASK_OSGI_INSTALL = "org.cauldron.sigil.noAskOSGIHome";
- public static final String PREFERENCES_ADD_IMPORT_FOR_EXPORT = "org.cauldron.sigil.addImportForExport";
- public static final String INCLUDE_OPTIONAL_DEPENDENCIES = "org.cauldron.sigil.includeOptionalDependencies";
-
- public static final String INSTALL_BUILDER_EXTENSION_POINT_ID = "org.cauldron.sigil.installbuilder";
- public static final String REPOSITORY_PROVIDER_EXTENSION_POINT_ID = "org.cauldron.sigil.repositoryprovider";
-
- public static final String MARKER_UNRESOLVED_DEPENDENCY = "org.cauldron.sigil.unresolvedDependencyMarker";
- public static final String MARKER_UNRESOLVED_IMPORT_PACKAGE = "org.cauldron.sigil.unresolvedDependencyMarker.importPackage";
- public static final String MARKER_UNRESOLVED_REQUIRE_BUNDLE = "org.cauldron.sigil.unresolvedDependencyMarker.requireBundle";
+ public static final String OSGI_INSTALLS = BASE + ".osgi.installs";
+ public static final String OSGI_DEFAULT_INSTALL_ID = BASE + ".osgi.default.install.id";
+ public static final String OSGI_INSTALL_PREFIX = BASE + ".osgi.install.";
+ public static final String OSGI_SOURCE_LOCATION = BASE + ".osgi.source.location";
+ public static final String OSGI_INSTALL_CHECK_PREFERENCE = BASE + ".osgi.install.check";
+ public static final String LIBRARY_KEYS_PREF = BASE + ".library.keys";
+ public static final String PREFERENCES_REBUILD_PROJECTS = BASE + ".rebuild.projects";
+ public static final String QUALIFY_VERSIONS = BASE + ".qualify.versions";
+
+ public static final String DEFAULT_VERSION_LOWER_BOUND = BASE + ".versionLowerBound";
+ public static final String DEFAULT_VERSION_UPPER_BOUND = BASE + ".versionUpperBound";
+
+ public static final String DEFAULT_EXCLUDED_RESOURCES = BASE + ".excludedResources";
+ public static final String PREFERENCES_NOASK_OSGI_INSTALL = BASE + ".noAskOSGIHome";
+ public static final String PREFERENCES_ADD_IMPORT_FOR_EXPORT = BASE + ".addImportForExport";
+ public static final String INCLUDE_OPTIONAL_DEPENDENCIES = BASE + ".includeOptionalDependencies";
+
+ public static final String INSTALL_BUILDER_EXTENSION_POINT_ID = BASE + ".installbuilder";
+ public static final String REPOSITORY_PROVIDER_EXTENSION_POINT_ID = BASE + ".repositoryprovider";
+
+ public static final String MARKER_UNRESOLVED_DEPENDENCY = BASE + ".unresolvedDependencyMarker";
+ public static final String MARKER_UNRESOLVED_IMPORT_PACKAGE = BASE + ".unresolvedDependencyMarker.importPackage";
+ public static final String MARKER_UNRESOLVED_REQUIRE_BUNDLE = BASE + ".unresolvedDependencyMarker.requireBundle";
public static final String REPOSITORY_SET = PLUGIN_ID + ".repository.set";
public static final String PREFERENCES_INCLUDE_OPTIONAL = PLUGIN_ID + ".include.optional";
Modified: felix/trunk/sigil/eclipse/help/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/help/plugin.xml?rev=795713&r1=795712&r2=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/help/plugin.xml (original)
+++ felix/trunk/sigil/eclipse/help/plugin.xml Mon Jul 20 07:53:24 2009
@@ -22,14 +22,14 @@
<extension
point="org.eclipse.ui.cheatsheets.cheatSheetContent">
<category
- id="org.cauldron.sigil.help.category"
+ id="org.apache.felix.sigil.help.category"
name="Sigil">
</category>
<cheatsheet
- category="org.cauldron.sigil.help.category"
+ category="org.apache.felix.sigil.help.category"
composite="false"
contentFile="cheatsheets/HelloWorld.xml"
- id="org.cauldron.sigil.help.createProjectCheatSheet"
+ id="org.apache.felix.sigil.help.createProjectCheatSheet"
name="Create a Hello World composite application">
</cheatsheet>
</extension>
Modified: felix/trunk/sigil/eclipse/obr/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/obr/plugin.xml?rev=795713&r1=795712&r2=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/obr/plugin.xml (original)
+++ felix/trunk/sigil/eclipse/obr/plugin.xml Mon Jul 20 07:53:24 2009
@@ -20,19 +20,19 @@
<?eclipse version="3.2"?>
<plugin>
<extension
- point="org.cauldron.sigil.repositoryprovider">
+ point="org.apache.felix.sigil.repositoryprovider">
<provider
- class="org.cauldron.bld.obr.OBRRepositoryProvider"
+ class="org.apache.felix.sigil.obr.OBRRepositoryProvider"
dynamic="true"
- id="org.cauldron.sigil.obr.provider"
+ id="org.apache.felix.sigil.obr.provider"
type="OSGi Bundle Repository (OBR)">
</provider>
</extension>
<extension
- point="org.cauldron.sigil.ui.repositorywizard">
+ point="org.apache.felix.sigil.ui.repositorywizard">
<wizard
class="org.apache.felix.sigil.obr.eclipse.OBRRepositoryWizard"
- repository="org.cauldron.sigil.obr.provider">
+ repository="org.apache.felix.sigil.obr.provider">
</wizard>
</extension>
Modified: felix/trunk/sigil/eclipse/ui/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/plugin.xml?rev=795713&r1=795712&r2=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/plugin.xml (original)
+++ felix/trunk/sigil/eclipse/ui/plugin.xml Mon Jul 20 07:53:24 2009
@@ -19,7 +19,7 @@
-->
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="org.cauldron.sigil.ui.repositorywizard" name="Repository Wizard" schema="schema/org.cauldron.sigil.ui.repositorywizard.exsd"/>
+ <extension-point id="org.apache.felix.sigil.ui.repositorywizard" name="Repository Wizard" schema="schema/org.apache.felix.sigil.ui.repositorywizard.exsd"/>
<extension
point="org.eclipse.ui.startup">
<startup class="org.apache.felix.sigil.ui.eclipse.startup.SigilStartup"/>
@@ -27,14 +27,14 @@
<extension
point="org.eclipse.ui.newWizards">
<category
- id="org.cauldron.sigil.newWizardCategory"
+ id="org.apache.felix.sigil.newWizardCategory"
name="Sigil"/>
<wizard
- category="org.cauldron.sigil.newWizardCategory"
+ category="org.apache.felix.sigil.newWizardCategory"
class="org.apache.felix.sigil.ui.eclipse.ui.wizard.project.SigilProjectWizard"
- finalPerspective="org.cauldron.sigil.ui.perspective"
+ finalPerspective="org.apache.felix.sigil.ui.perspective"
icon="etc/images/newton.png"
- id="org.cauldron.sigil.editors.newProjectWizard"
+ id="org.apache.felix.sigil.editors.newProjectWizard"
name="Sigil Project"
project="true"/>
</extension>
@@ -42,36 +42,36 @@
point="org.eclipse.ui.preferencePages">
<page
class="org.apache.felix.sigil.ui.eclipse.ui.preferences.SigilPreferencePage"
- id="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+ id="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
name="Sigil"/>
<!--page
- category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
- class="org.cauldron.sigil.ui.preferences.LibraryPreferencePage"
- id="org.cauldron.sigil.ui.libraryPreferences"
+ category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
+ class="org.apache.felix.sigil.ui.preferences.LibraryPreferencePage"
+ id="org.apache.felix.sigil.ui.libraryPreferences"
name="%librariesPrefsPage" >
</page-->
<page
- category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+ category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
class="org.apache.felix.sigil.ui.eclipse.ui.preferences.repository.RepositoriesPreferencePage"
- id="org.cauldron.sigil.ui.preferences.repositoriesPreferencePage"
+ id="org.apache.felix.sigil.ui.preferences.repositoriesPreferencePage"
name="%repositoriesPrefPage">
</page>
<page
- category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+ category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
class="org.apache.felix.sigil.ui.eclipse.ui.preferences.ExcludedResourcesPrefsPage"
- id="org.cauldron.sigil.ui.preferences.excludedResources"
+ id="org.apache.felix.sigil.ui.preferences.excludedResources"
name="Excluded Resources">
</page>
<page
- category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+ category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
class="org.apache.felix.sigil.ui.eclipse.ui.preferences.VersionsPreferencePage"
- id="org.cauldron.sigil.ui.preferences.VersionsPreferencePage"
+ id="org.apache.felix.sigil.ui.preferences.VersionsPreferencePage"
name="Version Handling">
</page>
<page
- category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+ category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
class="org.apache.felix.sigil.ui.eclipse.ui.preferences.installs.OSGiInstallsPreferencePage"
- id="org.cauldron.sigil.ui.preferences.newtonInstalls"
+ id="org.apache.felix.sigil.ui.preferences.osgiInstalls"
name="Newton Installs">
</page>
</extension>
@@ -82,19 +82,19 @@
default="true"
filenames="sigil.properties"
icon="etc/images/newton.png"
- id="org.cauldron.sigil.editors.SigilProjectEditor"
+ id="org.apache.felix.sigil.editors.SigilProjectEditor"
name="Sigil Project Editor"/>
</extension>
<extension
point="org.eclipse.jdt.core.classpathContainerInitializer">
<classpathContainerInitializer
class="org.apache.felix.sigil.ui.eclipse.classpath.SigilClasspathContainerInitializer"
- id="org.cauldron.sigil.core.classpathContainer"/>
+ id="org.apache.felix.sigil.classpathContainer"/>
</extension>
<extension
point="org.eclipse.jdt.ui.classpathContainerPage">
<classpathContainerPage
- class="org.apache.felix.sigil.ui.eclipse.classpath.SigilLibraryPage" id="org.cauldron.sigil.core.classpathContainer"
+ class="org.apache.felix.sigil.ui.eclipse.classpath.SigilLibraryPage" id="org.apache.felix.sigil.classpathContainer"
name="Sigil Library"/>
</extension>
<extension
@@ -102,7 +102,7 @@
<perspective
class="org.apache.felix.sigil.ui.eclipse.ui.perspective.SigilPerspectiveFactory"
icon="etc/images/newton.png"
- id="org.cauldron.sigil.ui.perspective"
+ id="org.apache.felix.sigil.ui.perspective"
name="Sigil">
</perspective>
</extension>
@@ -110,45 +110,45 @@
point="org.eclipse.jdt.ui.quickFixProcessors">
<quickFixProcessor
class="org.apache.felix.sigil.ui.eclipse.ui.quickfix.ImportQuickFixProcessor"
- id="org.cauldron.sigil.ui.quickFixProcessor1">
+ id="org.apache.felix.sigil.ui.importQuickFixProcessor">
</quickFixProcessor>
</extension>
<extension
point="org.eclipse.ui.views">
<view
allowMultiple="false"
- category="org.cauldron.sigil.ui.views"
+ category="org.apache.felix.sigil.ui.views"
class="org.apache.felix.sigil.ui.eclipse.ui.views.resolution.BundleResolverView"
icon="icons/jar_web_obj.png"
- id="org.cauldron.sigil.ui.bundleDependencyView"
+ id="org.apache.felix.sigil.ui.bundleDependencyView"
name="Bundle Dependency View"
restorable="true">
</view>
<view
allowMultiple="false"
- category="org.cauldron.sigil.ui.views"
+ category="org.apache.felix.sigil.ui.views"
class="org.apache.felix.sigil.ui.eclipse.ui.views.RepositoryViewPart"
icon="icons/jars_obj.png"
- id="org.cauldron.sigil.ui.repositoryBrowser"
+ id="org.apache.felix.sigil.ui.repositoryBrowser"
name="Repository Browser"
restorable="true">
</view>
<category
- id="org.cauldron.sigil.ui.views"
+ id="org.apache.felix.sigil.ui.views"
name="Sigil">
</category>
</extension>
<extension
- point="org.cauldron.sigil.ui.repositorywizard">
+ point="org.apache.felix.sigil.ui.repositorywizard">
<wizard
class="org.apache.felix.sigil.ui.eclipse.ui.internal.repository.FileSystemRepositoryWizard"
- repository="org.cauldron.sigil.core.file">
+ repository="org.apache.felix.sigil.core.file">
</wizard>
</extension>
<extension
point="org.eclipse.ui.commands">
<command
- id="org.cauldron.sigil.ui.commands.renameComposite"
+ id="org.apache.felix.sigil.ui.commands.renameComposite"
name="Rename Composite">
</command>
</extension>
@@ -156,18 +156,18 @@
point="org.eclipse.ltk.core.refactoring.refactoringContributions">
<contribution
class="org.apache.felix.sigil.ui.eclipse.ui.refactor.RenameCompositeRefactoring"
- id="org.cauldron.sigil.ui.rename.composite">
+ id="org.apache.felix.sigil.ui.rename.composite">
</contribution>
</extension>
<extension
point="org.eclipse.ui.propertyPages">
<page
class="org.apache.felix.sigil.ui.eclipse.ui.preferences.project.ProjectPropertyPage"
- id="org.cauldron.sigil.ui.projectpage"
+ id="org.apache.felix.sigil.ui.projectpage"
name="Repositories">
<filter
name="projectNature"
- value="org.cauldron.sigil.core.newtonnature"/>
+ value="org.apache.felix.sigil.sigilnature"/>
<enabledWhen>
<adapt
type="org.eclipse.core.resources.IProject">
@@ -183,7 +183,7 @@
icon="etc/images/newton.png"
label="Sigil">
<command
- commandId="org.cauldron.sigil.ui.convertproject"
+ commandId="org.apache.felix.sigil.ui.convertproject"
label="Convert Project"
style="push">
<visibleWhen
@@ -192,11 +192,11 @@
</command>
</menu>
<separator
- name="org.cauldron.sigil.ui.separator"
+ name="org.apache.felix.sigil.ui.separator"
visible="true">
</separator>
<command
- commandId="org.cauldron.sigil.ui.refreshclasspath"
+ commandId="org.apache.felix.sigil.ui.refreshclasspath"
icon="icons/refreshBundle.png"
label="Refresh bundle classpath"
style="push">
@@ -209,22 +209,22 @@
<extension
point="org.eclipse.ui.commands">
<command
- id="org.cauldron.sigil.ui.convertproject"
+ id="org.apache.felix.sigil.ui.convertproject"
name="%commandConvertProject">
</command>
<command
- id="org.cauldron.sigil.ui.refreshclasspath"
+ id="org.apache.felix.sigil.ui.refreshclasspath"
name="%commandRefreshClasspath">
</command>
</extension>
<extension
point="org.eclipse.ui.commandImages">
<image
- commandId="org.cauldron.sigil.ui.convertproject"
+ commandId="org.apache.felix.sigil.ui.convertproject"
icon="etc/images/newton.png">
</image>
<image
- commandId="org.cauldron.sigil.ui.refreshclasspath"
+ commandId="org.apache.felix.sigil.ui.refreshclasspath"
icon="etc/images/newton.png">
</image>
</extension>
@@ -233,7 +233,7 @@
point="org.eclipse.ui.handlers">
<handler
class="org.apache.felix.sigil.ui.eclipse.handlers.project.ConvertProjectHandler"
- commandId="org.cauldron.sigil.ui.convertproject">
+ commandId="org.apache.felix.sigil.ui.convertproject">
<activeWhen>
<with
variable="selection">
@@ -244,7 +244,7 @@
value="org.eclipse.core.resources.IProject">
</instanceof>
<test
- property="org.cauldron.sigil.isSigilProject"
+ property="org.apache.felix.sigil.isSigilProject"
value="false">
</test>
</iterate>
@@ -253,7 +253,7 @@
</handler>
<handler
class="org.apache.felix.sigil.ui.eclipse.handlers.project.RefreshSigilClasspathHandler"
- commandId="org.cauldron.sigil.ui.refreshclasspath">
+ commandId="org.apache.felix.sigil.ui.refreshclasspath">
<activeWhen>
<with
variable="selection">
@@ -264,7 +264,7 @@
value="org.eclipse.core.resources.IProject">
</instanceof>
<test
- property="org.cauldron.sigil.isSigilProject"
+ property="org.apache.felix.sigil.isSigilProject"
value="true">
</test>
</iterate>
Propchange: felix/trunk/sigil/eclipse/ui/schema/org.apache.felix.sigil.ui.repositorywizard.exsd
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/eclipse/utils/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/utils/plugin.xml?rev=795713&r1=795712&r2=795713&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/utils/plugin.xml (original)
+++ felix/trunk/sigil/eclipse/utils/plugin.xml Mon Jul 20 07:53:24 2009
@@ -23,22 +23,22 @@
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
class="org.apache.felix.sigil.utils.properties.EditorPropertyTester"
- id="org.cauldron.sigil.utils.editorPropertyTester"
- namespace="org.cauldron.sigil"
+ id="org.apache.felix.sigil.utils.editorPropertyTester"
+ namespace="org.apache.felix.sigil"
properties="isEditorOfType"
type="org.eclipse.ui.IWorkbenchPart">
</propertyTester>
<propertyTester
class="org.apache.felix.sigil.utils.properties.PartKindPropertyTester"
- id="org.cauldron.sigil.runtime.PartKindPropertyTester"
- namespace="org.cauldron.sigil"
+ id="org.apache.felix.sigil.runtime.PartKindPropertyTester"
+ namespace="org.apache.felix.sigil"
properties="partKind,partId"
type="org.eclipse.ui.IWorkbenchPart">
</propertyTester>
<propertyTester
class="org.apache.felix.sigil.utils.properties.ResourceTypePropertyTester"
- id="org.cauldron.sigil.utils.ResourcePropertyTester"
- namespace="org.cauldron.sigil"
+ id="org.apache.felix.sigil.utils.ResourcePropertyTester"
+ namespace="org.apache.felix.sigil"
properties="isResourceOfType"
type="org.eclipse.core.resources.IResource">
</propertyTester>