felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsav...@apache.org
Subject svn commit: r793825 [6/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...
Date Tue, 14 Jul 2009 09:23:28 GMT
Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/BackgroundLoadingSelectionDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/BackgroundLoadingSelectionDialog.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/BackgroundLoadingSelectionDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/BackgroundLoadingSelectionDialog.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.ArrayList;
 import java.util.Collection;
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.cauldron.sigil.ui.editors.project.IElementDescriptor;
-import org.cauldron.sigil.ui.editors.project.WrappedContentProposal;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.IElementDescriptor;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.WrappedContentProposal;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.Job;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ColumnModelLabelProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ColumnModelLabelProvider.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/ColumnModelLabelProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ColumnModelLabelProvider.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 org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultContentProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultContentProvider.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/DefaultContentProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultContentProvider.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 org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.Viewer;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultLabelProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultLabelProvider.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/DefaultLabelProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultLabelProvider.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 org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTableProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTableProvider.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/DefaultTableProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTableProvider.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;
 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTreeContentProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTreeContentProvider.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/DefaultTreeContentProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/DefaultTreeContentProvider.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 org.eclipse.jface.viewers.ITreeContentProvider;
 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExclusionContentProposalProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExclusionContentProposalProvider.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/ExclusionContentProposalProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExclusionContentProposalProvider.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.ArrayList;
 import java.util.Collection;
@@ -25,9 +25,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.cauldron.sigil.ui.editors.project.IElementDescriptor;
-import org.cauldron.sigil.ui.editors.project.WrappedContentProposal;
-import org.cauldron.sigil.utils.GlobCompiler;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.IElementDescriptor;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.WrappedContentProposal;
+import org.apache.felix.sigil.utils.GlobCompiler;
 import org.eclipse.jface.fieldassist.IContentProposal;
 import org.eclipse.jface.fieldassist.IContentProposalProvider;
 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExportedPackageFinder.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExportedPackageFinder.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/ExportedPackageFinder.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ExportedPackageFinder.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.util;
+package org.apache.felix.sigil.ui.eclipse.ui.util;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
+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.IModelWalker;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/FileUtils.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/FileUtils.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/FileUtils.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/FileUtils.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 org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.DirectoryDialog;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IAccumulator.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IAccumulator.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/IAccumulator.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IAccumulator.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;
 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IExportToImportConverter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IExportToImportConverter.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/IExportToImportConverter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IExportToImportConverter.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;
 
 public interface IExportToImportConverter<E,I> {
 	I convert(E exportElement);

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IFilter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IFilter.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/IFilter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IFilter.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;
 
 public interface IFilter<T> {
 	boolean select(T element);

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IValidationListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IValidationListener.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/IValidationListener.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/IValidationListener.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;
 
 public interface IValidationListener {
 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.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/ModelLabelProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ModelLabelProvider.java Tue Jul 14 09:23:15 2009
@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.util;
+package org.apache.felix.sigil.ui.eclipse.ui.util;
 
 import java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-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.model.repository.IRepositoryModel;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.model.IModelElement;
+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.repository.IBundleRepository;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 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/util/PackageFilter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/PackageFilter.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/PackageFilter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/PackageFilter.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.util;
+package org.apache.felix.sigil.ui.eclipse.ui.util;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
 
 public class PackageFilter implements IFilter<IPackageImport> {
 	

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ProjectUtils.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ProjectUtils.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/ProjectUtils.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ProjectUtils.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.util;
+package org.apache.felix.sigil.ui.eclipse.ui.util;
 
 import java.util.concurrent.Callable;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.preferences.OptionalPrompt;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.preferences.OptionalPrompt;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.widgets.Shell;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourceReviewDialog.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourceReviewDialog.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/ResourceReviewDialog.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourceReviewDialog.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.util;
+package org.apache.felix.sigil.ui.eclipse.ui.util;
 
 import java.util.Collection;
 
-import org.cauldron.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelElement;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.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/ResourcesDialogHelper.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/ResourcesDialogHelper.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.ArrayList;
 import java.util.Collection;
@@ -26,19 +26,19 @@
 import java.util.List;
 import java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IModelWalker;
-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.IPackageModelElement;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
-import org.cauldron.sigil.ui.editors.project.IElementDescriptor;
-import org.cauldron.sigil.ui.editors.project.NewPackageExportDialog;
-import org.cauldron.sigil.ui.editors.project.NewResourceSelectionDialog;
+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.IModelElement;
+import org.apache.felix.sigil.model.IModelWalker;
+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.IPackageModelElement;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.IElementDescriptor;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.NewPackageExportDialog;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.NewResourceSelectionDialog;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/SingletonSelection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/SingletonSelection.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/SingletonSelection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/SingletonSelection.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.ArrayList;
 import java.util.Collections;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/WrappedContentProposalLabelProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/WrappedContentProposalLabelProvider.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/WrappedContentProposalLabelProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/util/WrappedContentProposalLabelProvider.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.util;
+package org.apache.felix.sigil.ui.eclipse.ui.util;
 
-import org.cauldron.sigil.ui.editors.project.IElementDescriptor;
-import org.cauldron.sigil.ui.editors.project.WrappedContentProposal;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.IElementDescriptor;
+import org.apache.felix.sigil.ui.eclipse.ui.editors.project.WrappedContentProposal;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/views/ModelElementComparator.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/views/ModelElementComparator.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/views/ModelElementComparator.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/ModelElementComparator.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.views;
+package org.apache.felix.sigil.ui.eclipse.ui.views;
 
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+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.eclipse.jface.viewers.ContentViewer;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;

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

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/views/RepositoryViewPart.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/views/RepositoryViewPart.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/views/RepositoryViewPart.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/RepositoryViewPart.java Tue Jul 14 09:23:15 2009
@@ -17,25 +17,25 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.views;
+package org.apache.felix.sigil.ui.eclipse.ui.views;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ICompoundModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.util.ModelHelper;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryChangeListener;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
-import org.cauldron.sigil.repository.RepositoryChangeEvent;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.util.DefaultTreeContentProvider;
-import org.cauldron.sigil.ui.util.ModelLabelProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.util.ModelHelper;
+import org.apache.felix.sigil.model.ICompoundModelElement;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryChangeListener;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.repository.RepositoryChangeEvent;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTreeContentProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ModelLabelProvider;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleConnectionHighlighter.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.views.resolution;
+package org.apache.felix.sigil.ui.eclipse.ui.views.resolution;
 
 import java.util.Set;
 
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraph.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.views.resolution;
+package org.apache.felix.sigil.ui.eclipse.ui.views.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.Set;
 
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
 
 public class BundleGraph {
 

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleGraphLabelProvider.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.views.resolution;
+package org.apache.felix.sigil.ui.eclipse.ui.views.resolution;
 
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.ui.SigilUI;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/BundleResolverView.java Tue Jul 14 09:23:15 2009
@@ -17,24 +17,24 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.views.resolution;
+package org.apache.felix.sigil.ui.eclipse.ui.views.resolution;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-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.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IResolutionMonitor;
-import org.cauldron.sigil.repository.ResolutionConfig;
-import org.cauldron.sigil.repository.ResolutionException;
-import org.cauldron.sigil.repository.ResolutionMonitorAdapter;
-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.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.repository.IResolutionMonitor;
+import org.apache.felix.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/views/resolution/Link.java Tue Jul 14 09:23:15 2009
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.views.resolution;
+package org.apache.felix.sigil.ui.eclipse.ui.views.resolution;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
 
 public class Link {	
 	public static class Unsatisfied {

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/wizard/SigilNewResourceWizard.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/wizard/SigilNewResourceWizard.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/wizard/SigilNewResourceWizard.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/SigilNewResourceWizard.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.wizard;
+package org.apache.felix.sigil.ui.eclipse.ui.wizard;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.dialogs.MessageDialog;

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

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/wizard/WorkspaceContentProvider.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/wizard/WorkspaceContentProvider.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/wizard/WorkspaceContentProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/WorkspaceContentProvider.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.wizard;
+package org.apache.felix.sigil.ui.eclipse.ui.wizard;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.cauldron.sigil.SigilCore;
+import org.apache.felix.sigil.eclipse.SigilCore;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizard.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.wizard.project;
+package org.apache.felix.sigil.ui.eclipse.ui.wizard.project;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.ui.wizard.SigilNewResourceWizard;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.SigilNewResourceWizard;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.wizard.project;
+package org.apache.felix.sigil.ui.eclipse.ui.wizard.project;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
+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.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/wizard/repository/RepositoryWizardPage.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.wizard.repository;
+package org.apache.felix.sigil.ui.eclipse.ui.wizard.repository;
 
 import java.util.ArrayList;
 
-import org.cauldron.sigil.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.eclipse.jface.preference.FieldEditor;
 import org.eclipse.jface.preference.StringFieldEditor;
 import org.eclipse.jface.wizard.WizardPage;

Modified: felix/trunk/sigil/org.cauldron.sigil.utils/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.utils/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.utils/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.sigil.utils/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -9,4 +9,4 @@
 Import-Package: org.eclipse.core.expressions,
  org.eclipse.core.resources,
  org.eclipse.ui
-Export-Package: org.cauldron.sigil.utils
+Export-Package: org.apache.felix.sigil.utils

Modified: felix/trunk/sigil/org.cauldron.sigil.utils/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.utils/plugin.xml?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.utils/plugin.xml (original)
+++ felix/trunk/sigil/org.cauldron.sigil.utils/plugin.xml Tue Jul 14 09:23:15 2009
@@ -22,21 +22,21 @@
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
-            class="org.cauldron.sigil.utils.properties.EditorPropertyTester"
+            class="org.apache.felix.sigil.utils.properties.EditorPropertyTester"
             id="org.cauldron.sigil.utils.editorPropertyTester"
             namespace="org.cauldron.sigil"
             properties="isEditorOfType"
             type="org.eclipse.ui.IWorkbenchPart">
       </propertyTester>
       <propertyTester
-            class="org.cauldron.sigil.utils.properties.PartKindPropertyTester"
+            class="org.apache.felix.sigil.utils.properties.PartKindPropertyTester"
             id="org.cauldron.sigil.runtime.PartKindPropertyTester"
             namespace="org.cauldron.sigil"
             properties="partKind,partId"
             type="org.eclipse.ui.IWorkbenchPart">
       </propertyTester>
       <propertyTester
-            class="org.cauldron.sigil.utils.properties.ResourceTypePropertyTester"
+            class="org.apache.felix.sigil.utils.properties.ResourceTypePropertyTester"
             id="org.cauldron.sigil.utils.ResourcePropertyTester"
             namespace="org.cauldron.sigil"
             properties="isResourceOfType"

Copied: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/GlobCompiler.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/GlobCompiler.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/GlobCompiler.java?p2=felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/GlobCompiler.java&p1=felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/GlobCompiler.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/GlobCompiler.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/GlobCompiler.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.utils;
+package org.apache.felix.sigil.utils;
 
 import java.util.regex.Pattern;
 

Propchange: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/GlobCompiler.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/PathHelper.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/PathHelper.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/PathHelper.java?p2=felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/PathHelper.java&p1=felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/PathHelper.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/PathHelper.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/PathHelper.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.utils;
+package org.apache.felix.sigil.utils;
 
 import java.io.File;
 import java.util.List;

Propchange: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/PathHelper.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/SigilUtils.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/SigilUtils.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/SigilUtils.java?p2=felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/SigilUtils.java&p1=felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/SigilUtils.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.utils/src/org/cauldron/sigil/utils/SigilUtils.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/SigilUtils.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.utils;
+package org.apache.felix.sigil.utils;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.Platform;

Propchange: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/SigilUtils.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.utils/src/org/apache/felix/sigil/utils/properties/EditorPropertyTester.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.utils.properties;
+package org.apache.felix.sigil.utils.properties;
 
-import org.cauldron.sigil.utils.SigilUtils;
+import org.apache.felix.sigil.utils.SigilUtils;
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ui.IEditorInput;

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

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

Propchange: felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/Feature.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/Feature.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/Feature.java (original)
+++ felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/Feature.java Tue Jul 14 09:23:15 2009
@@ -19,7 +19,7 @@
 /**
  * 
  */
-package org.cauldron.sigil.build;
+package org.apache.felix.sigil.build;
 
 class Feature {
 	String id, version, url;

Modified: felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/FindBundlesTask.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/FindBundlesTask.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/FindBundlesTask.java (original)
+++ felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/FindBundlesTask.java Tue Jul 14 09:23:15 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.cauldron.sigil.build;
+package org.apache.felix.sigil.build;
 
 import java.io.File;
 import java.io.FilenameFilter;

Modified: felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatureContentHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatureContentHandler.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatureContentHandler.java (original)
+++ felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatureContentHandler.java Tue Jul 14 09:23:15 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.cauldron.sigil.build;
+package org.apache.felix.sigil.build;
 
 import java.util.List;
 
@@ -29,7 +29,7 @@
 class SiteInsertFeatureContentHandler implements ContentHandler {
 	
 	private final ContentHandler output;
-	private final List<org.cauldron.sigil.build.Feature> featureList;
+	private final List<org.apache.felix.sigil.build.Feature> featureList;
 
 	public SiteInsertFeatureContentHandler(ContentHandler output,
 			List<Feature> featureList) {

Modified: felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatures.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatures.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatures.java (original)
+++ felix/trunk/sigil/sigil-builder/src/org/apache/felix/sigil/build/SiteInsertFeatures.java Tue Jul 14 09:23:15 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.cauldron.sigil.build;
+package org.apache.felix.sigil.build;
 
 import java.io.File;
 import java.io.FileInputStream;



Mime
View raw message