felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsav...@apache.org
Subject svn commit: r793825 [4/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.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.model.repository;
+package org.apache.felix.sigil.eclipse.model.repository;
 
 import java.util.List;
 import java.util.Map;
 
-import org.cauldron.sigil.internal.model.repository.RepositoryType;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryType;
 import org.eclipse.core.runtime.CoreException;
 
 public interface IRepositoryConfiguration {

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

Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.model.repository;
+package org.apache.felix.sigil.eclipse.model.repository;
 
 public interface IRepositorySet {
 	void setRepository(IRepositoryModel id, int position);

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

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

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.model.util;
+package org.apache.felix.sigil.eclipse.model.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -38,23 +38,23 @@
 import java.util.jar.JarInputStream;
 import java.util.regex.Pattern;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-import org.cauldron.sigil.model.eclipse.ISCAComposite;
-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.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IResolution;
-import org.cauldron.sigil.repository.ResolutionConfig;
-import org.cauldron.sigil.repository.ResolutionException;
-import org.cauldron.sigil.repository.ResolutionMonitorAdapter;
+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.ModelElementFactory;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.model.eclipse.ISCAComposite;
+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.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;

Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java Tue Jul 14 09:23:15 2009
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-package org.cauldron.sigil.model.util;
+package org.apache.felix.sigil.eclipse.model.util;
 
 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.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.IRequiredBundle;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.model.ICompoundModelElement;
+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.IRequiredBundle;
 
 public class ModelHelper {
 	public static List<IModelElement> findUsers(IModelElement e) {

Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.model.util;
+package org.apache.felix.sigil.eclipse.model.util;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,9 +28,9 @@
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.utils.GlobCompiler;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.utils.GlobCompiler;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 

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

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

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.preferences;
+package org.apache.felix.sigil.eclipse.preferences;
 
 public enum PromptablePreference {
 	Always, Prompt, Never

Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.preferences;
+package org.apache.felix.sigil.eclipse.preferences;
 
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.internal.model.repository.RepositoryConfiguration;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryConfiguration;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
 

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.help/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.help/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.help/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.sigil.help/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -14,5 +14,5 @@
  org.cauldron.sigil.core;bundle-version="0.5.5"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Import-Package: org.cauldron.sigil.model.eclipse,
+Import-Package: org.apache.felix.sigil.model.eclipse,
  org.eclipse.core.resources

Modified: felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/OpenEmptySigilProjectWizardAction.java Tue Jul 14 09:23:15 2009
@@ -19,7 +19,7 @@
 
 package org.cauldron.sigil.cheatsheets.actions;
 
-import org.cauldron.sigil.ui.wizard.project.SigilProjectWizard;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.project.SigilProjectWizard;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.cheatsheets.ICheatSheetAction;

Modified: felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ResolveProjectDependencies.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ResolveProjectDependencies.java?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ResolveProjectDependencies.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ResolveProjectDependencies.java Tue Jul 14 09:23:15 2009
@@ -19,9 +19,9 @@
 
 package org.cauldron.sigil.cheatsheets.actions;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.actions.ResolveProjectDependenciesAction;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.ui.eclipse.actions.ResolveProjectDependenciesAction;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;

Modified: felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ShowViewAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ShowViewAction.java?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ShowViewAction.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.help/src/org/cauldron/sigil/cheatsheets/actions/ShowViewAction.java Tue Jul 14 09:23:15 2009
@@ -19,7 +19,7 @@
 
 package org.cauldron.sigil.cheatsheets.actions;
 
-import org.cauldron.sigil.SigilCore;
+import org.apache.felix.sigil.eclipse.SigilCore;
 import org.eclipse.jface.action.Action;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;

Modified: felix/trunk/sigil/org.cauldron.sigil.junit/src/org/cauldron/sigil/junit/activator/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.junit/src/org/cauldron/sigil/junit/activator/Activator.java?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.junit/src/org/cauldron/sigil/junit/activator/Activator.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.junit/src/org/cauldron/sigil/junit/activator/Activator.java Tue Jul 14 09:23:15 2009
@@ -19,7 +19,7 @@
 
 package org.cauldron.sigil.junit.activator;
 
-import org.cauldron.sigil.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 

Modified: felix/trunk/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -3,7 +3,7 @@
 Bundle-Name: OBR Plug-in
 Bundle-SymbolicName: org.cauldron.sigil.obr;singleton:=true
 Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.cauldron.sigil.obr.Activator
+Bundle-Activator: org.apache.felix.sigil.obr.eclipse.Activator
 Bundle-Vendor: Paremus Ltd
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -12,5 +12,5 @@
  org.cauldron.bld.core
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Import-Package: org.cauldron.bld.obr,
- org.cauldron.sigil.model
+Import-Package: org.apache.felix.sigil.model,
+ org.cauldron.sigil.obr

Modified: felix/trunk/sigil/org.cauldron.sigil.obr/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.obr/plugin.xml?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.obr/plugin.xml (original)
+++ felix/trunk/sigil/org.cauldron.sigil.obr/plugin.xml Tue Jul 14 09:23:15 2009
@@ -31,7 +31,7 @@
    <extension
          point="org.cauldron.sigil.ui.repositorywizard">
       <wizard
-            class="org.cauldron.sigil.obr.OBRRepositoryWizard"
+            class="org.apache.felix.sigil.obr.eclipse.OBRRepositoryWizard"
             repository="org.cauldron.sigil.obr.provider">
       </wizard>
    </extension>

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

Copied: felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/Activator.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java?p2=felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java&p1=felix/trunk/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/Activator.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/Activator.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr.eclipse;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;

Propchange: felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

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

Propchange: felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizardPage.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java?p2=felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java&p1=felix/trunk/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizardPage.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr.eclipse;
 
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-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.core.runtime.IPath;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.DirectoryFieldEditor;

Propchange: felix/trunk/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.search/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.search/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.search/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.sigil.search/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -3,7 +3,7 @@
 Bundle-Name: Search Plug-in
 Bundle-SymbolicName: org.cauldron.sigil.search;singleton:=true
 Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.cauldron.sigil.search.SigilSearch
+Bundle-Activator: org.apache.felix.sigil.search.SigilSearch
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core;bundle-version="3.4.0",
@@ -12,6 +12,6 @@
  org.eclipse.core.resources;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.cauldron.sigil.search
+Export-Package: org.apache.felix.sigil.search
 Bundle-ClassPath: lib/bcel-5.2.jar,
  .

Copied: felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/ISearchResult.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.search/src/org/cauldron/sigil/search/ISearchResult.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/ISearchResult.java?p2=felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/ISearchResult.java&p1=felix/trunk/sigil/org.cauldron.sigil.search/src/org/cauldron/sigil/search/ISearchResult.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.search/src/org/cauldron/sigil/search/ISearchResult.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/ISearchResult.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.cauldron.sigil.search;
+package org.apache.felix.sigil.search;
 
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
 
 public interface ISearchResult {
 	ISigilBundle getProvider();

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

Copied: felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/SigilSearch.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.search/src/org/cauldron/sigil/search/SigilSearch.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/SigilSearch.java?p2=felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/SigilSearch.java&p1=felix/trunk/sigil/org.cauldron.sigil.search/src/org/cauldron/sigil/search/SigilSearch.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.search/src/org/cauldron/sigil/search/SigilSearch.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/SigilSearch.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.search;
+package org.apache.felix.sigil.search;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,16 +33,16 @@
 
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.JavaClass;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-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.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryChangeListener;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
-import org.cauldron.sigil.repository.RepositoryChangeEvent;
-import org.cauldron.sigil.search.index.Index;
+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.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+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.search.index.Index;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.ICompilationUnit;

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

Propchange: felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/index/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/index/Index.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/index/Index.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/index/Index.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.search/src/org/apache/felix/sigil/search/index/Index.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.search.index;
+package org.apache.felix.sigil.search.index;
 
 import java.lang.ref.SoftReference;
 import java.util.Collections;
@@ -31,13 +31,13 @@
 import java.util.regex.Pattern;
 
 import org.apache.bcel.classfile.JavaClass;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.search.ISearchResult;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.search.ISearchResult;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -3,7 +3,7 @@
 Bundle-Name: Ui Plug-in
 Bundle-SymbolicName: org.cauldron.sigil.ui;singleton:=true
 Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.cauldron.sigil.ui.SigilUI
+Bundle-Activator: org.apache.felix.sigil.ui.eclipse.ui.SigilUI
 Bundle-Vendor: Paremus Ltd
 Require-Bundle: org.cauldron.sigil.core,
  org.cauldron.bld.core,
@@ -24,11 +24,11 @@
  org.eclipse.zest.layouts;bundle-version="[1,2)",
  org.eclipse.ltk.core.refactoring
 Eclipse-LazyStart: true
-Export-Package: org.cauldron.sigil.actions,
- org.cauldron.sigil.handlers,
- org.cauldron.sigil.ui,
- org.cauldron.sigil.ui.util,
- org.cauldron.sigil.ui.wizard.project,
- org.cauldron.sigil.ui.wizard.repository
+Export-Package: org.apache.felix.sigil.ui.eclipse.actions,
+ org.apache.felix.sigil.ui.eclipse.handlers,
+ org.apache.felix.sigil.ui.eclipse.ui,
+ org.apache.felix.sigil.ui.eclipse.ui.util,
+ org.apache.felix.sigil.ui.eclipse.ui.wizard.project,
+ org.apache.felix.sigil.ui.eclipse.ui.wizard.repository
 Bundle-Localization: plugin
 

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/plugin.xml?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/plugin.xml (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/plugin.xml Tue Jul 14 09:23:15 2009
@@ -22,7 +22,7 @@
    <extension-point id="org.cauldron.sigil.ui.repositorywizard" name="Repository Wizard" schema="schema/org.cauldron.sigil.ui.repositorywizard.exsd"/>
       <extension
          point="org.eclipse.ui.startup">
-      <startup class="org.cauldron.sigil.startup.SigilStartup"/>
+      <startup class="org.apache.felix.sigil.ui.eclipse.startup.SigilStartup"/>
    </extension>
    <extension
          point="org.eclipse.ui.newWizards">
@@ -31,7 +31,7 @@
             name="Sigil"/>
       <wizard
             category="org.cauldron.sigil.newWizardCategory"
-            class="org.cauldron.sigil.ui.wizard.project.SigilProjectWizard"
+            class="org.apache.felix.sigil.ui.eclipse.ui.wizard.project.SigilProjectWizard"
             finalPerspective="org.cauldron.sigil.ui.perspective"
             icon="etc/images/newton.png"
             id="org.cauldron.sigil.editors.newProjectWizard"
@@ -41,7 +41,7 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            class="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
+            class="org.apache.felix.sigil.ui.eclipse.ui.preferences.SigilPreferencePage"
             id="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
             name="Sigil"/>
       <!--page
@@ -52,25 +52,25 @@
       </page-->
       <page
             category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
-            class="org.cauldron.sigil.ui.preferences.repository.RepositoriesPreferencePage"
+            class="org.apache.felix.sigil.ui.eclipse.ui.preferences.repository.RepositoriesPreferencePage"
             id="org.cauldron.sigil.ui.preferences.repositoriesPreferencePage"
             name="%repositoriesPrefPage">
       </page>
       <page
             category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
-            class="org.cauldron.sigil.ui.preferences.ExcludedResourcesPrefsPage"
+            class="org.apache.felix.sigil.ui.eclipse.ui.preferences.ExcludedResourcesPrefsPage"
             id="org.cauldron.sigil.ui.preferences.excludedResources"
             name="Excluded Resources">
       </page>
       <page
             category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
-            class="org.cauldron.sigil.ui.preferences.VersionsPreferencePage"
+            class="org.apache.felix.sigil.ui.eclipse.ui.preferences.VersionsPreferencePage"
             id="org.cauldron.sigil.ui.preferences.VersionsPreferencePage"
             name="Version Handling">
       </page>
       <page
             category="org.cauldron.sigil.ui.preferences.SigilPreferencePage"
-            class="org.cauldron.sigil.ui.preferences.installs.OSGiInstallsPreferencePage"
+            class="org.apache.felix.sigil.ui.eclipse.ui.preferences.installs.OSGiInstallsPreferencePage"
             id="org.cauldron.sigil.ui.preferences.newtonInstalls"
             name="Newton Installs">
       </page>
@@ -78,7 +78,7 @@
    <extension
          point="org.eclipse.ui.editors">
       <editor
-            class="org.cauldron.sigil.ui.editors.project.SigilProjectEditorPart"
+            class="org.apache.felix.sigil.ui.eclipse.ui.editors.project.SigilProjectEditorPart"
             default="true"
             filenames="sigil.properties"
             icon="etc/images/newton.png"
@@ -88,19 +88,19 @@
    <extension
          point="org.eclipse.jdt.core.classpathContainerInitializer">
       <classpathContainerInitializer
-            class="org.cauldron.sigil.classpath.SigilClasspathContainerInitializer"
+            class="org.apache.felix.sigil.ui.eclipse.classpath.SigilClasspathContainerInitializer"
             id="org.cauldron.sigil.core.classpathContainer"/>
    </extension>
    <extension
          point="org.eclipse.jdt.ui.classpathContainerPage">
       <classpathContainerPage
-            class="org.cauldron.sigil.classpath.SigilLibraryPage"        id="org.cauldron.sigil.core.classpathContainer"
+            class="org.apache.felix.sigil.ui.eclipse.classpath.SigilLibraryPage"        id="org.cauldron.sigil.core.classpathContainer"
             name="Sigil Library"/>
    </extension>
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
-            class="org.cauldron.sigil.ui.perspective.SigilPerspectiveFactory"
+            class="org.apache.felix.sigil.ui.eclipse.ui.perspective.SigilPerspectiveFactory"
             icon="etc/images/newton.png"
             id="org.cauldron.sigil.ui.perspective"
             name="Sigil">
@@ -109,7 +109,7 @@
    <extension
          point="org.eclipse.jdt.ui.quickFixProcessors">
       <quickFixProcessor
-            class="org.cauldron.sigil.ui.quickfix.ImportQuickFixProcessor"
+            class="org.apache.felix.sigil.ui.eclipse.ui.quickfix.ImportQuickFixProcessor"
             id="org.cauldron.sigil.ui.quickFixProcessor1">
       </quickFixProcessor>
    </extension>
@@ -118,7 +118,7 @@
       <view
             allowMultiple="false"
             category="org.cauldron.sigil.ui.views"
-            class="org.cauldron.sigil.ui.views.resolution.BundleResolverView"
+            class="org.apache.felix.sigil.ui.eclipse.ui.views.resolution.BundleResolverView"
             icon="icons/jar_web_obj.png"
             id="org.cauldron.sigil.ui.bundleDependencyView"
             name="Bundle Dependency View"
@@ -127,7 +127,7 @@
       <view
             allowMultiple="false"
             category="org.cauldron.sigil.ui.views"
-            class="org.cauldron.sigil.ui.views.RepositoryViewPart"
+            class="org.apache.felix.sigil.ui.eclipse.ui.views.RepositoryViewPart"
             icon="icons/jars_obj.png"
             id="org.cauldron.sigil.ui.repositoryBrowser"
             name="Repository Browser"
@@ -141,7 +141,7 @@
    <extension
          point="org.cauldron.sigil.ui.repositorywizard">
       <wizard
-            class="org.cauldron.sigil.ui.internal.repository.FileSystemRepositoryWizard"
+            class="org.apache.felix.sigil.ui.eclipse.ui.internal.repository.FileSystemRepositoryWizard"
             repository="org.cauldron.sigil.core.file">
       </wizard>
    </extension>
@@ -155,14 +155,14 @@
    <extension
          point="org.eclipse.ltk.core.refactoring.refactoringContributions">
       <contribution
-            class="org.cauldron.sigil.ui.refactor.RenameCompositeRefactoring"
+            class="org.apache.felix.sigil.ui.eclipse.ui.refactor.RenameCompositeRefactoring"
             id="org.cauldron.sigil.ui.rename.composite">
       </contribution>
    </extension>
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            class="org.cauldron.sigil.ui.preferences.project.ProjectPropertyPage"
+            class="org.apache.felix.sigil.ui.eclipse.ui.preferences.project.ProjectPropertyPage"
             id="org.cauldron.sigil.ui.projectpage"
             name="Repositories">
          <filter
@@ -232,7 +232,7 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="org.cauldron.sigil.handlers.project.ConvertProjectHandler"
+            class="org.apache.felix.sigil.ui.eclipse.handlers.project.ConvertProjectHandler"
             commandId="org.cauldron.sigil.ui.convertproject">
          <activeWhen>
             <with
@@ -252,7 +252,7 @@
          </activeWhen>
       </handler>      
       <handler
-            class="org.cauldron.sigil.handlers.project.RefreshSigilClasspathHandler"
+            class="org.apache.felix.sigil.ui.eclipse.handlers.project.RefreshSigilClasspathHandler"
             commandId="org.cauldron.sigil.ui.refreshclasspath">
          <activeWhen>
             <with

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/PruneProjectDependenciesAction.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.cauldron.sigil.actions;
+package org.apache.felix.sigil.ui.eclipse.actions;
 
 import java.util.Collection;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.util.ResourceReviewDialog;
+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.ui.eclipse.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ResourceReviewDialog;
 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/actions/RefreshRepositoryAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/RefreshRepositoryAction.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/RefreshRepositoryAction.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/RefreshRepositoryAction.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.cauldron.sigil.actions;
+package org.apache.felix.sigil.ui.eclipse.actions;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-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.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.repository.IBundleRepository;
+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.SubMonitor;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/actions/ResolveProjectDependenciesAction.java Tue Jul 14 09:23:15 2009
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.cauldron.sigil.actions;
+package org.apache.felix.sigil.ui.eclipse.actions;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.util.ResourceReviewDialog;
+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.IPackageImport;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ResourceReviewDialog;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

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

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/classpath/SigilLibraryPage.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.cauldron.sigil.classpath;
+package org.apache.felix.sigil.ui.eclipse.classpath;
 
-import org.cauldron.sigil.SigilCore;
+import org.apache.felix.sigil.eclipse.SigilCore;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.JavaCore;

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

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

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

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

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

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

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

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/ConvertProjectCommandHandler.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.handlers.project;
+package org.apache.felix.sigil.ui.eclipse.handlers.project;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.handlers.IResourceCommandHandler;
-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.ui.eclipse.handlers.IResourceCommandHandler;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IProject;

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/handlers/project/RefreshSigilClasspathCommandHandler.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.cauldron.sigil.handlers.project;
+package org.apache.felix.sigil.ui.eclipse.handlers.project;
 
 import java.lang.reflect.InvocationTargetException;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.handlers.IResourceCommandHandler;
-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.ui.eclipse.handlers.IResourceCommandHandler;
+import org.apache.felix.sigil.ui.eclipse.ui.SigilUI;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IProject;

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/startup/SigilStartup.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.cauldron.sigil.startup;
+package org.apache.felix.sigil.ui.eclipse.startup;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.job.ResolveProjectsJob;
-import org.cauldron.sigil.repository.IRepositoryChangeListener;
-import org.cauldron.sigil.repository.RepositoryChangeEvent;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.job.ResolveProjectsJob;
+import org.apache.felix.sigil.repository.IRepositoryChangeListener;
+import org.apache.felix.sigil.repository.RepositoryChangeEvent;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.ui.IStartup;

Copied: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/SigilUI.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java?p2=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java&p1=felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/SigilUI.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.ui/src/org/cauldron/sigil/ui/SigilUI.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui;
+package org.apache.felix.sigil.ui.eclipse.ui;
 
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import org.cauldron.sigil.SigilCore;
+import org.apache.felix.sigil.eclipse.SigilCore;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageRegistry;

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

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/completion/CompletionProposal.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/completion/CompletionProposal.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/completion/CompletionProposal.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/completion/CompletionProposal.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.cauldron.sigil.ui.editors.completion;
+package org.apache.felix.sigil.ui.eclipse.ui.editors.completion;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;

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

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/AbstractResourceSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/AbstractResourceSection.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/AbstractResourceSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/AbstractResourceSection.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 java.io.File;
 
-import org.cauldron.sigil.SigilCore;
-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.SigilCore;
+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.resources.IContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/BundleDependencySection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/BundleDependencySection.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/BundleDependencySection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/BundleDependencySection.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 java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.cauldron.sigil.model.IModelElement;
-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.model.IModelElement;
+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.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ISelection;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ClasspathSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ClasspathSection.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/ClasspathSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ClasspathSection.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;
@@ -27,15 +27,15 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
-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.DefaultTableProvider;
-import org.cauldron.sigil.ui.util.IFilter;
-import org.cauldron.sigil.ui.util.ModelLabelProvider;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+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.DefaultTableProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.IFilter;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ModelLabelProvider;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.JavaModelException;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContainerTreeProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContainerTreeProvider.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/ContainerTreeProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContainerTreeProvider.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.ui.util.DefaultTreeContentProvider;
+import org.apache.felix.sigil.ui.eclipse.ui.util.DefaultTreeContentProvider;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentSummarySection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentSummarySection.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/ContentSummarySection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentSummarySection.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.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/ContentsForm.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.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/ContentsForm.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ContentsForm.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/DependenciesForm.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependenciesForm.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/DependenciesForm.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependenciesForm.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 java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-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.model.IModelElement;
+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/DependencyManagementSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependencyManagementSection.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/DependencyManagementSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DependencyManagementSection.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.Collection;
 import java.util.HashMap;
@@ -25,20 +25,20 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-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.project.ISigilProjectModel;
-import org.cauldron.sigil.ui.SigilUI;
-import org.cauldron.sigil.ui.form.SigilPage;
-import org.cauldron.sigil.ui.form.SigilSection;
-import org.cauldron.sigil.ui.util.AccumulatorAdapter;
-import org.cauldron.sigil.ui.util.ExportedPackageFinder;
+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.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+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.SigilUI;
+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.AccumulatorAdapter;
+import org.apache.felix.sigil.ui.eclipse.ui.util.ExportedPackageFinder;
 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/editors/project/DownloadSection.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DownloadSection.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/DownloadSection.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/DownloadSection.java Tue Jul 14 09:23:15 2009
@@ -17,18 +17,18 @@
  * 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.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.eclipse.IDownloadJar;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-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.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.eclipse.IDownloadJar;
+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.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;

Modified: felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExcludedResourcesFilter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExcludedResourcesFilter.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/ExcludedResourcesFilter.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.ui/src/org/apache/felix/sigil/ui/eclipse/ui/editors/project/ExcludedResourcesFilter.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.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.preferences.PrefsUtils;
-import org.cauldron.sigil.utils.GlobCompiler;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.preferences.PrefsUtils;
+import org.apache.felix.sigil.utils.GlobCompiler;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.Viewer;



Mime
View raw message