svn commit: r793825 [5/6] - in /felix/trunk/sigil: bld-ivy/src/org/apache/ bld-ivy/src/org/apache/felix/ bld-ivy/src/org/apache/felix/sigil/ bld-ivy/src/org/apache/felix/sigil/ant/ bld-ivy/src/org/apache/felix/sigil/ivy/ bld-ivy/src/org/cauldron/bld/an...

[ds...@apache.org]

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportPackagesSection.java Tue Jul 14 09:23:15 2009
@@ -17,24 +17,24 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.preferences.OptionalPrompt;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
-import org.cauldron.sigil.ui.util.ResourcesDialogHelper;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
+import org.apache.felix.sigil.ui.eclipse.ui.preferences.OptionalPrompt;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ResourcesDialogHelper;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jface.preference.IPreferenceStore;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExportsForm.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.SigilPage;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.IManagedForm;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/GeneralInfoSection.java Tue Jul 14 09:23:15 2009
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.IFormValueConverter;
-import org.cauldron.sigil.ui.form.SigilFormEntry;
-import org.cauldron.sigil.ui.form.SigilFormEntryAdapter;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.form.SigilSection;
-import org.cauldron.sigil.ui.util.BackgroundLoadingSelectionDialog;
-import org.cauldron.sigil.ui.util.ResourcesDialogHelper;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.ui.eclipse.ui.form.IFormValueConverter;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilFormEntry;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilFormEntryAdapter;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilSection;
+import org.apache.felix.sigil.ui.eclipse.ui.util.BackgroundLoadingSelectionDialog;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ResourcesDialogHelper;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IDependencyChecker.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 
 public interface IDependencyChecker {
 	boolean isSatisfied(IPackageImport packageImport);

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/IElementDescriptor.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 public interface IElementDescriptor<E> {	
 	/**

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ImportPackagesSection.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,15 +25,15 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IPackageModelElement;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
-import org.cauldron.sigil.ui.util.ResourcesDialogHelper;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IPackageModelElement;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ResourcesDialogHelper;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewPackageExportDialog.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.util.Comparator;
 
-import org.cauldron.sigil.ui.util.BackgroundLoadingSelectionDialog;
+import org.apache.felix.sigil.ui.eclipse.ui.util.BackgroundLoadingSelectionDialog;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/NewResourceSelectionDialog.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-import org.cauldron.sigil.model.osgi.IVersionedModelElement;
-import org.cauldron.sigil.ui.util.BackgroundLoadingSelectionDialog;
-import org.cauldron.sigil.ui.util.IValidationListener;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.model.osgi.IVersionedModelElement;
+import org.apache.felix.sigil.ui.eclipse.ui.util.BackgroundLoadingSelectionDialog;
+import org.apache.felix.sigil.ui.eclipse.ui.util.IValidationListener;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/OverviewForm.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.SigilPage;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.IManagedForm;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PackageExportDialog.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ViewerFilter;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectLabelProvider.java Tue Jul 14 09:23:15 2009
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.io.InputStream;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.ui.util.DefaultLabelProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultLabelProvider;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IPackageFragment;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ProjectTableViewer.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.util.Set;
 
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.ui.util.ModelLabelProvider;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ModelLabelProvider;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.widgets.Table;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/PropertiesForm.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 
-import org.cauldron.sigil.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.internal.ui.propertiesfileeditor.IPropertiesFilePartitions;
 import org.eclipse.jdt.internal.ui.propertiesfileeditor.PropertiesFileSourceViewerConfiguration;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/RequiresBundleSection.java Tue Jul 14 09:23:15 2009
@@ -17,23 +17,23 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 
 import java.util.Iterator;
 import java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
-import org.cauldron.sigil.ui.util.ResourcesDialogHelper;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ResourcesDialogHelper;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceBuildSection.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.util.ModelLabelProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ModelLabelProvider;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeListener;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceImportDialog.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.ViewerFilter;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ResourceSelectDialog.java Tue Jul 14 09:23:15 2009
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.cauldron.sigil.ui.util.ModelLabelProvider;
-import org.cauldron.sigil.ui.util.SingletonSelection;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ModelLabelProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.SingletonSelection;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilProjectEditorPart.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
@@ -25,14 +25,14 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/SigilSourcePage.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.IProgressMonitor;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/TestingSection.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.form.SigilSection;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilSection;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ToolsSection.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.actions.PruneProjectDependenciesAction;
-import org.cauldron.sigil.actions.ResolveProjectDependenciesAction;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.form.SigilSection;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.ui.eclipse.actions.PruneProjectDependenciesAction;
+import org.apache.felix.sigil.ui.eclipse.actions.ResolveProjectDependenciesAction;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilPage;
+import org.apache.felix.sigil.ui.eclipse.ui.form.SigilSection;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionRangeComponent.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.ui.util.IValidationListener;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.ui.eclipse.ui.util.IValidationListener;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/VersionsChangeListener.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
-import org.cauldron.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRange;
 
 public interface VersionsChangeListener {
 	void versionsChanged(VersionRange range);

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/WrappedContentProposal.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.project;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.project;
 
 import org.eclipse.jface.fieldassist.IContentProposal;
 

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/IFormValueConverter.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.form;
+package org.apache.felix.sigil.ui.eclipse.ui.form;
 
 public interface IFormValueConverter {
 	String getLabel(Object value);

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/ISigilFormEntryListener.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.form;
+package org.apache.felix.sigil.ui.eclipse.ui.form;
 
 public interface ISigilFormEntryListener {
 	void browseButtonSelected(SigilFormEntry form);

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntry.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.form;
+package org.apache.felix.sigil.ui.eclipse.ui.form;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusAdapter;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilFormEntryAdapter.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.form;
+package org.apache.felix.sigil.ui.eclipse.ui.form;
 
 public class SigilFormEntryAdapter implements ISigilFormEntryListener{
 	public void browseButtonSelected(SigilFormEntry form) {

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilPage.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.form;
+package org.apache.felix.sigil.ui.eclipse.ui.form;
 
 import org.eclipse.ui.forms.editor.FormEditor;
 import org.eclipse.ui.forms.editor.FormPage;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/form/SigilSection.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.form;
+package org.apache.felix.sigil.ui.eclipse.ui.form;
 
-import org.cauldron.sigil.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizard.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.internal.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
 
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
 
 public class FileSystemRepositoryWizard extends RepositoryWizard {
 	@Override

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.internal.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
 
 import java.io.File;
 
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizardPage;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizardPage;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.jface.wizard.IWizardPage;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizard.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.internal.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
 
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
 
 public class OSGiInstallRepositoryWizard extends RepositoryWizard {
 	@Override

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/internal/repository/OSGiInstallRepositoryWizardPage.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.internal.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.internal.repository;
 
 import java.util.ArrayList;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.install.IOSGiInstall;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizardPage;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizardPage;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
 
 public class OSGiInstallRepositoryWizardPage extends RepositoryWizardPage {

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.perspective;
+package org.apache.felix.sigil.ui.eclipse.ui.perspective;
 
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.ui.IFolderLayout;

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/ExcludedResourcesPrefsPage.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/ExcludedResourcesPrefsPage.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/ExcludedResourcesPrefsPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.preferences.PrefsUtils;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.preferences.PrefsUtils;
 import org.eclipse.core.internal.preferences.PrefsMessages;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ExcludedResourcesPrefsPage.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/LibraryConfigurationDialog.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/LibraryConfigurationDialog.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/LibraryConfigurationDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java Tue Jul 14 09:23:15 2009
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences;
 
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.TreeSet;
 
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IPackageModelElement;
-import org.cauldron.sigil.ui.editors.project.NewResourceSelectionDialog;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
-import org.cauldron.sigil.ui.util.ResourcesDialogHelper;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IPackageModelElement;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.NewResourceSelectionDialog;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ResourcesDialogHelper;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryConfigurationDialog.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/LibraryPreferencePage.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/LibraryPreferencePage.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/LibraryPreferencePage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java Tue Jul 14 09:23:15 2009
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences;
 
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.TreeSet;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/LibraryPreferencePage.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/OptionalPrompt.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/OptionalPrompt.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/OptionalPrompt.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences;
 
-import org.cauldron.sigil.preferences.PromptablePreference;
+import org.apache.felix.sigil.eclipse.preferences.PromptablePreference;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.IPreferenceStore;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/OptionalPrompt.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/ProjectDependentPreferencesPage.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/ProjectDependentPreferencesPage.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/ProjectDependentPreferencesPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences;
 
-import org.cauldron.sigil.ui.util.ProjectUtils;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ProjectUtils;
 import org.eclipse.jface.preference.PreferencePage;
 
 public abstract class ProjectDependentPreferencesPage extends PreferencePage {

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/ProjectDependentPreferencesPage.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/SigilPreferencePage.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/SigilPreferencePage.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/SigilPreferencePage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.preferences.PromptablePreference;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.preferences.PromptablePreference;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/SigilPreferencePage.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/VersionsPreferencePage.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/VersionsPreferencePage.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/preferences/VersionsPreferencePage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/VersionsPreferencePage.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/installs/OSGiInstallsPreferencePage.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.installs;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.installs;
 
 import java.util.HashMap;
 import java.util.UUID;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.install.IOSGiInstallType;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.preferences.ProjectDependentPreferencesPage;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallType;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.preferences.ProjectDependentPreferencesPage;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/project/ProjectPropertyPage.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.project;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.project;
 
 import java.util.concurrent.Callable;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
-import org.cauldron.sigil.ui.util.ProjectUtils;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ProjectUtils;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.preference.PreferenceDialog;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/NewRepositoryWizard.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
-import org.cauldron.sigil.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.eclipse.jface.wizard.Wizard;
 
 public class NewRepositoryWizard extends Wizard {

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesPreferencePage.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryConfiguration;
-import org.cauldron.sigil.model.repository.IRepositorySet;
-import org.cauldron.sigil.model.repository.RepositorySet;
-import org.cauldron.sigil.ui.preferences.ProjectDependentPreferencesPage;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryConfiguration;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositorySet;
+import org.apache.felix.sigil.eclipse.model.repository.RepositorySet;
+import org.apache.felix.sigil.ui.eclipse.ui.preferences.ProjectDependentPreferencesPage;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.SWT;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoriesView.java Tue Jul 14 09:23:15 2009
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.actions.RefreshRepositoryAction;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.ui.eclipse.actions.RefreshRepositoryAction;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelectionChangedListener;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetDialog.java Tue Jul 14 09:23:15 2009
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.ui.util.DefaultLabelProvider;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultLabelProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.CheckboxTableViewer;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositorySetsView.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,12 +25,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositorySet;
-import org.cauldron.sigil.model.repository.RepositorySet;
-import org.cauldron.sigil.ui.util.DefaultLabelProvider;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositorySet;
+import org.apache.felix.sigil.eclipse.model.repository.RepositorySet;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultLabelProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryTypeSelectionPage.java Tue Jul 14 09:23:15 2009
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositoryType;
-import org.cauldron.sigil.ui.util.DefaultTableProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTableProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryViewData.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
-import org.cauldron.sigil.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 
 class RepositoryViewData {
 	private String name;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/RepositoryWizardNode.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jface.wizard.IWizardNode;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/preferences/repository/WizardHelper.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.preferences.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.preferences.repository;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryType;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportPackageProposal.java Tue Jul 14 09:23:15 2009
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.quickfix;
+package org.apache.felix.sigil.ui.eclipse.ui.quickfix;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportQuickFixProcessor.java Tue Jul 14 09:23:15 2009
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.quickfix;
+package org.apache.felix.sigil.ui.eclipse.ui.quickfix;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
-import org.cauldron.sigil.search.ISearchResult;
-import org.cauldron.sigil.search.SigilSearch;
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.search.ISearchResult;
+import org.apache.felix.sigil.search.SigilSearch;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.ICompilationUnit;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportSearchResultProposal.java Tue Jul 14 09:23:15 2009
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.quickfix;
+package org.apache.felix.sigil.ui.eclipse.ui.quickfix;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.search.ISearchResult;
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.search.ISearchResult;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.ICompilationUnit;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/quickfix/ImportedClassReference.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.quickfix;
+package org.apache.felix.sigil.ui.eclipse.ui.quickfix;
 
-import org.cauldron.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
 
 public class ImportedClassReference {
 	private IPackageImport pi;

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/refactor/RenameCompositeRefactoring.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.refactor;
+package org.apache.felix.sigil.ui.eclipse.ui.refactor;
 
 import java.util.Map;
 

Propchange: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/AccumulatorAdapter.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.util;
+package org.apache.felix.sigil.ui.eclipse.ui.util;
 
 import java.util.Collection;
 import java.util.LinkedList;