final patches for FELIX-1367
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@795373 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/common/obr/.classpath b/sigil/common/obr/.classpath
index 64c5e31..d2c2949 100644
--- a/sigil/common/obr/.classpath
+++ b/sigil/common/obr/.classpath
@@ -1,7 +1,7 @@
<?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.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/sigil/common/obr/.project b/sigil/common/obr/.project
index e4f71db..82ea9fa 100644
--- a/sigil/common/obr/.project
+++ b/sigil/common/obr/.project
@@ -11,12 +11,7 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.cauldron.sigil.core.newtonBuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -24,5 +19,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.cauldron.sigil.core.newtonnature</nature>
</natures>
</projectDescription>
diff --git a/sigil/common/obr/sigil.properties b/sigil/common/obr/sigil.properties
new file mode 100644
index 0000000..9376501
--- /dev/null
+++ b/sigil/common/obr/sigil.properties
@@ -0,0 +1,21 @@
+
+# sigil project file, saved by plugin.
+
+version: 0.0.0
+
+-bundles: \
+ org.cauldron.bld.obr, \
+
+-sourcedirs: \
+ src, \
+
+-imports: \
+ org.apache.felix.sigil.model, \
+ org.apache.felix.sigil.model.common, \
+ org.apache.felix.sigil.model.eclipse, \
+ org.apache.felix.sigil.model.osgi, \
+ org.apache.felix.sigil.repository, \
+ org.eclipse.core.runtime;version=3.4.0, \
+ org.osgi.framework;version=1.4.0, \
+
+# end
diff --git a/sigil/eclipse/core/sigil.properties b/sigil/eclipse/core/sigil.properties
index ce01583..bf1b4a0 100644
--- a/sigil/eclipse/core/sigil.properties
+++ b/sigil/eclipse/core/sigil.properties
@@ -11,18 +11,24 @@
-exports: \
org.apache.felix.sigil.eclipse, \
+ org.apache.felix.sigil.eclipse.install, \
+ org.apache.felix.sigil.eclipse.job, \
org.apache.felix.sigil.eclipse.model.project, \
org.apache.felix.sigil.eclipse.model.repository, \
org.apache.felix.sigil.eclipse.model.util, \
+ org.apache.felix.sigil.eclipse.preferences, \
-imports: \
org.apache.felix.sigil.bnd, \
org.apache.felix.sigil.config, \
org.apache.felix.sigil.core, \
org.apache.felix.sigil.eclipse, \
+ org.apache.felix.sigil.eclipse.install, \
+ org.apache.felix.sigil.eclipse.job, \
org.apache.felix.sigil.eclipse.model.project, \
org.apache.felix.sigil.eclipse.model.repository, \
org.apache.felix.sigil.eclipse.model.util, \
+ org.apache.felix.sigil.eclipse.preferences, \
org.apache.felix.sigil.model, \
org.apache.felix.sigil.model.common, \
org.apache.felix.sigil.model.eclipse, \
@@ -40,6 +46,7 @@
org.eclipse.jface.preference;version=3.4.1, \
org.eclipse.jface.resource;version=3.4.1, \
org.eclipse.jface.util;version=3.4.1, \
+ org.eclipse.jface.window;version=3.4.1, \
org.eclipse.ui;version=3.4.1, \
org.eclipse.ui.console;version=3.3.1, \
org.eclipse.ui.dialogs;version=3.4.1, \
@@ -54,5 +61,6 @@
org.eclipse.equinox.registry;version=3.4.0, \
org.eclipse.swt;version=3.4.2, \
org.eclipse.swt.carbon.macosx;version=3.4.1, \
+ org.eclipse.ui.workbench;version=3.4.1, \
# end
diff --git a/sigil/eclipse/help/sigil.properties b/sigil/eclipse/help/sigil.properties
index adf4df8..be1cbaa 100644
--- a/sigil/eclipse/help/sigil.properties
+++ b/sigil/eclipse/help/sigil.properties
@@ -11,7 +11,11 @@
-imports: \
org.apache.felix.sigil.eclipse, \
+ org.apache.felix.sigil.eclipse.model.project, \
+ org.apache.felix.sigil.ui.eclipse.actions, \
+ org.apache.felix.sigil.ui.eclipse.ui.wizard.project, \
org.eclipse.core.resources;version=3.4.1, \
+ org.eclipse.core.runtime.jobs;version=3.4.0, \
org.eclipse.jface.action;version=3.4.1, \
org.eclipse.jface.dialogs;version=3.4.1, \
org.eclipse.jface.viewers;version=3.4.1, \
@@ -25,8 +29,12 @@
org.osgi.framework;version=1.4.0, \
-requires: \
+ org.eclipse.core.commands;version=3.4.0, \
org.eclipse.core.runtime;version=3.4.0, \
org.eclipse.equinox.common;version=3.4.0, \
+ org.eclipse.equinox.registry;version=3.4.0, \
+ org.eclipse.swt;version=3.4.2, \
org.eclipse.swt.carbon.macosx;version=3.4.1, \
+ org.eclipse.ui.workbench;version=3.4.1, \
# end
diff --git a/sigil/eclipse/ui/sigil.properties b/sigil/eclipse/ui/sigil.properties
index b11b6c8..9c2e20e 100644
--- a/sigil/eclipse/ui/sigil.properties
+++ b/sigil/eclipse/ui/sigil.properties
@@ -10,28 +10,49 @@
src, \
-exports: \
+ org.apache.felix.sigil.ui.eclipse.actions, \
+ org.apache.felix.sigil.ui.eclipse.ui.wizard.project, \
org.apache.felix.sigil.ui.eclipse.ui.wizard.repository, \
-imports: \
org.apache.felix.sigil.eclipse, \
+ org.apache.felix.sigil.eclipse.install, \
+ org.apache.felix.sigil.eclipse.job, \
org.apache.felix.sigil.eclipse.model.project, \
org.apache.felix.sigil.eclipse.model.repository, \
+ org.apache.felix.sigil.eclipse.model.util, \
+ org.apache.felix.sigil.eclipse.preferences, \
org.apache.felix.sigil.model, \
org.apache.felix.sigil.model.common, \
org.apache.felix.sigil.model.eclipse, \
org.apache.felix.sigil.model.osgi, \
org.apache.felix.sigil.repository, \
org.apache.felix.sigil.search, \
+ org.apache.felix.sigil.ui.eclipse.actions, \
+ org.apache.felix.sigil.ui.eclipse.ui.wizard.project, \
org.apache.felix.sigil.ui.eclipse.ui.wizard.repository, \
+ org.apache.felix.sigil.utils, \
+ org.eclipse.core.commands;version=3.4.0, \
org.eclipse.core.commands.common;version=3.4.0, \
+ org.eclipse.core.internal.preferences;version=3.2.201, \
org.eclipse.core.resources;version=3.4.1, \
org.eclipse.core.runtime;version=3.4.0, \
org.eclipse.core.runtime.jobs;version=3.4.0, \
org.eclipse.debug.core;version=3.4.0, \
+ org.eclipse.debug.ui;version=3.4.2, \
+ org.eclipse.draw2d;version=3.4.2, \
org.eclipse.jdt.core;version=3.4.2, \
org.eclipse.jdt.core.compiler;version=3.4.2, \
org.eclipse.jdt.core.dom;version=3.4.2, \
org.eclipse.jdt.core.dom.rewrite;version=3.4.2, \
+ org.eclipse.jdt.internal.corext.dom;version=3.4.2, \
+ org.eclipse.jdt.internal.corext.util;version=3.4.2, \
+ org.eclipse.jdt.internal.ui;version=3.4.2, \
+ org.eclipse.jdt.internal.ui.propertiesfileeditor;version=3.4.2, \
+ org.eclipse.jdt.ui;version=3.4.2, \
+ org.eclipse.jdt.ui.text;version=3.4.2, \
+ org.eclipse.jdt.ui.text.java;version=3.4.2, \
+ org.eclipse.jdt.ui.wizards;version=3.4.2, \
org.eclipse.jface.action;version=3.4.1, \
org.eclipse.jface.dialogs;version=3.4.1, \
org.eclipse.jface.fieldassist;version=3.4.1, \
@@ -39,24 +60,44 @@
org.eclipse.jface.operation;version=3.4.1, \
org.eclipse.jface.preference;version=3.4.1, \
org.eclipse.jface.resource;version=3.4.1, \
+ org.eclipse.jface.text;version=3.4.2, \
+ org.eclipse.jface.text.contentassist;version=3.4.2, \
org.eclipse.jface.util;version=3.4.1, \
org.eclipse.jface.viewers;version=3.4.1, \
org.eclipse.jface.window;version=3.4.1, \
org.eclipse.jface.wizard;version=3.4.1, \
+ org.eclipse.ltk.core.refactoring;version=3.4.2, \
+ org.eclipse.pde.internal.ui.editor;version=3.4.0, \
+ org.eclipse.pde.internal.ui.parts;version=3.4.0, \
org.eclipse.ui;version=3.4.1, \
org.eclipse.ui.actions;version=3.4.1, \
org.eclipse.ui.dialogs;version=3.4.1, \
+ org.eclipse.ui.editors.text;version=3.4.0, \
+ org.eclipse.ui.forms;version=3.3.103, \
+ org.eclipse.ui.forms.editor;version=3.3.103, \
+ org.eclipse.ui.forms.events;version=3.3.103, \
+ org.eclipse.ui.forms.widgets;version=3.3.103, \
org.eclipse.ui.handlers;version=3.4.1, \
+ org.eclipse.ui.ide;version=3.4.2, \
org.eclipse.ui.part;version=3.4.1, \
org.eclipse.ui.plugin;version=3.4.1, \
org.eclipse.ui.progress;version=3.4.1, \
+ org.eclipse.ui.texteditor;version=3.4.0, \
org.eclipse.ui.wizards.newresource;version=3.4.2, \
+ org.eclipse.zest.core.viewers;version=1.0.0, \
+ org.eclipse.zest.core.widgets;version=1.0.0, \
+ org.eclipse.zest.layouts;version=1.0.0, \
+ org.eclipse.zest.layouts.algorithms;version=1.0.0, \
org.osgi.framework;version=1.4.0, \
org.osgi.service.prefs;version=1.1.0, \
-requires: \
+ org.eclipse.core.runtime;version=3.4.0, \
org.eclipse.equinox.registry;version=3.4.0, \
org.eclipse.swt;version=3.4.2, \
org.eclipse.swt.carbon.macosx;version=3.4.1, \
+ org.eclipse.text;version=3.4.0, \
+ org.eclipse.ui.workbench;version=3.4.1, \
+ org.eclipse.ui.workbench.texteditor;version=3.4.1, \
# end
diff --git a/sigil/eclipse/utils/sigil.properties b/sigil/eclipse/utils/sigil.properties
index 2d01503..eb67c6c 100644
--- a/sigil/eclipse/utils/sigil.properties
+++ b/sigil/eclipse/utils/sigil.properties
@@ -23,5 +23,6 @@
-requires: \
org.eclipse.core.runtime;version=3.4.0, \
org.eclipse.ui.ide;version=3.4.2, \
+ org.eclipse.ui.workbench;version=3.4.1, \
# end