You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/07/14 11:23:28 UTC
svn commit: r793825 [3/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...
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISCAComposite.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.model.eclipse;
+package org.apache.felix.sigil.model.eclipse;
-import org.cauldron.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelElement;
import org.eclipse.core.runtime.IPath;
/**
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java Tue Jul 14 09:23:15 2009
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.cauldron.sigil.model.eclipse;
+package org.apache.felix.sigil.model.eclipse;
import java.io.IOException;
import java.util.Set;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.cauldron.sigil.model.ICompoundModelElement;
-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.IVersionedModelElement;
+import org.apache.felix.sigil.model.ICompoundModelElement;
+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.IVersionedModelElement;
/**
* @author dave
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.cauldron.sigil.model.osgi;
+package org.apache.felix.sigil.model.osgi;
import java.net.URI;
import java.util.Collection;
import java.util.Set;
-import org.cauldron.sigil.model.ICompoundModelElement;
-import org.cauldron.sigil.model.INamedModelElement;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.model.ICompoundModelElement;
+import org.apache.felix.sigil.model.INamedModelElement;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
import org.osgi.framework.Version;
public interface IBundleModelElement extends INamedModelElement, ICompoundModelElement, IVersionedModelElement {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.osgi;
+package org.apache.felix.sigil.model.osgi;
import java.util.Collection;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.model.osgi;
+package org.apache.felix.sigil.model.osgi;
-import org.cauldron.sigil.model.IRequirementModelElement;
+import org.apache.felix.sigil.model.IRequirementModelElement;
public interface IPackageImport extends IPackageModelElement, IVersionRangeModelElement, IRequirementModelElement, Comparable<IPackageImport> {
/**
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.model.osgi;
+package org.apache.felix.sigil.model.osgi;
-import org.cauldron.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelElement;
public interface IPackageModelElement extends IModelElement {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.cauldron.sigil.model.osgi;
+package org.apache.felix.sigil.model.osgi;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IRequirementModelElement;
-import org.cauldron.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IRequirementModelElement;
+import org.apache.felix.sigil.model.common.VersionRange;
public interface IRequiredBundle extends IModelElement, IRequirementModelElement, Comparable<IRequiredBundle> {
String getSymbolicName();
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.model.osgi;
+package org.apache.felix.sigil.model.osgi;
-import org.cauldron.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRange;
public interface IVersionRangeModelElement {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.osgi;
+package org.apache.felix.sigil.model.osgi;
import org.osgi.framework.Version;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
import java.io.IOException;
import java.io.OutputStream;
@@ -28,20 +28,20 @@
import java.util.jar.Attributes;
import java.util.jar.Manifest;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.bld.core.licence.ILicenseManager;
-import org.cauldron.bld.core.licence.ILicensePolicy;
-import org.cauldron.bld.core.util.QuoteUtil;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-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.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.core.licence.ILicenseManager;
+import org.apache.felix.sigil.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.core.util.QuoteUtil;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+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.osgi.framework.Version;
public abstract class AbstractBundleRepository implements IBundleRepository {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,12 +30,12 @@
import java.util.Map;
import java.util.TreeMap;
-import org.cauldron.bld.core.repository.BundleResolver;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.repository.RepositoryChangeEvent.Type;
+import org.apache.felix.sigil.core.repository.BundleResolver;
+import org.apache.felix.sigil.model.IModelWalker;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.RepositoryChangeEvent.Type;
public abstract class AbstractRepositoryManager implements IRepositoryManager, IBundleRepositoryListener {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepository.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-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.eclipse.ILibrary;
+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 interface IBundleRepository {
static final int NORMAL_PRIORITY = 0;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
public interface IBundleRepositoryListener {
void notifyChange(IBundleRepository repository);
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleResolver.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleResolver.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IBundleResolver.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
-import org.cauldron.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelElement;
public interface IBundleResolver {
IResolution resolve(IModelElement element, ResolutionConfig config, IResolutionMonitor monitor) throws ResolutionException;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
public interface IProviderChangeListener {
void notifyChange(IRepositoryProvider provider);
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
public interface IRepositoryChangeListener {
void repositoryChanged(RepositoryChangeEvent event);
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryManager.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryManager.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
import java.util.Collection;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.model.IModelWalker;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
import org.eclipse.core.runtime.CoreException;
public interface IRepositoryManager {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
import java.util.Properties;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
public interface IRepositoryVisitor {
/**
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolution.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolution.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolution.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolution.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-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 interface IResolution {
Set<ISigilBundle> getBundles();
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
-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 interface IResolutionMonitor {
boolean isCanceled();
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
public class RepositoryChangeEvent {
public static enum Type { ADDED, CHANGED, REMOVED };
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryException.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryException.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryException.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/RepositoryException.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
public class RepositoryException extends Exception {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionConfig.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionConfig.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionConfig.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
public class ResolutionConfig {
private int options;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionException.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionException.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionException.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionException.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
-import org.cauldron.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelElement;
public class ResolutionException extends Exception {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.cauldron.sigil.repository;
+package org.apache.felix.sigil.repository;
import org.eclipse.core.runtime.IProgressMonitor;
-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 ResolutionMonitorAdapter implements IResolutionMonitor {
Modified: felix/trunk/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -8,4 +8,4 @@
Require-Bundle: org.cauldron.bld.core;bundle-version="0.6.0",
org.eclipse.equinox.common;bundle-version="3.4.0"
Import-Package: org.osgi.framework;version="1.4.0"
-Export-Package: org.cauldron.bld.obr
+Export-Package: org.cauldron.sigil.obr
Propchange: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.io.FileOutputStream;
@@ -30,7 +30,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.repository.AbstractBundleRepository;
public abstract class AbstractOBRBundleRepository extends AbstractBundleRepository {
private static SAXParserFactory factory = SAXParserFactory.newInstance();
Modified: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.lang.ref.SoftReference;
@@ -26,8 +26,8 @@
import java.util.List;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
public class CachingOBRBundleRepository extends AbstractOBRBundleRepository {
Modified: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java Tue Jul 14 09:23:15 2009
@@ -17,18 +17,17 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.net.URL;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
public class NonCachingOBRBundleRepository extends AbstractOBRBundleRepository {
- public static void main(String[] args) throws Exception {
+ /*public static void main(String[] args) throws Exception {
String url = args[0];
String obr = args[1];
String cache = args[2];
@@ -41,7 +40,7 @@
return true;
}
});
- }
+ } */
public NonCachingOBRBundleRepository(String id, URL repositoryURL, File obrCache, File bundleCache, long updatePeriod) {
super(id, repositoryURL, obrCache, bundleCache, updatePeriod);
Modified: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.net.URI;
@@ -29,17 +29,17 @@
import java.util.LinkedList;
import java.util.List;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.LDAPExpr;
-import org.cauldron.sigil.model.common.LDAPParseException;
-import org.cauldron.sigil.model.common.LDAPParser;
-import org.cauldron.sigil.model.common.SimpleTerm;
-import org.cauldron.sigil.model.common.VersionRange;
-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.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.common.LDAPExpr;
+import org.apache.felix.sigil.model.common.LDAPParseException;
+import org.apache.felix.sigil.model.common.LDAPParser;
+import org.apache.felix.sigil.model.common.SimpleTerm;
+import org.apache.felix.sigil.model.common.VersionRange;
+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.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.osgi.framework.Version;
Modified: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
public interface OBRListener {
void handleBundle(ISigilBundle bundle);
Modified: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.net.MalformedURLException;
@@ -25,9 +25,9 @@
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
-import org.cauldron.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.RepositoryException;
public class OBRRepositoryProvider implements IRepositoryProvider {
public IBundleRepository createRepository(String id, Properties preferences) throws RepositoryException {
Modified: felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java Tue Jul 14 09:23:15 2009
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.util.ArrayList;
import java.util.List;
-import org.cauldron.sigil.model.common.LDAPExpr;
-import org.cauldron.sigil.model.common.LDAPParseException;
-import org.cauldron.sigil.model.common.LDAPParser;
-import org.cauldron.sigil.model.common.Not;
-import org.cauldron.sigil.model.common.Ops;
-import org.cauldron.sigil.model.common.SimpleTerm;
-import org.cauldron.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.LDAPExpr;
+import org.apache.felix.sigil.model.common.LDAPParseException;
+import org.apache.felix.sigil.model.common.LDAPParser;
+import org.apache.felix.sigil.model.common.Not;
+import org.apache.felix.sigil.model.common.Ops;
+import org.apache.felix.sigil.model.common.SimpleTerm;
+import org.apache.felix.sigil.model.common.VersionRange;
import org.osgi.framework.Version;
class VersionRangeHelper {
Modified: felix/trunk/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -3,7 +3,7 @@
Bundle-Name: org.cauldron.sigil.core
Bundle-SymbolicName: org.cauldron.sigil.core;singleton:=true
Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.cauldron.sigil.SigilCore
+Bundle-Activator: org.apache.felix.sigil.eclipse.SigilCore
Bundle-Vendor: Paremus Ltd.
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.expressions,
@@ -15,13 +15,13 @@
org.cauldron.sigil.utils,
org.cauldron.bld.core
Bundle-ActivationPolicy: lazy
-Export-Package: org.cauldron.sigil,
- org.cauldron.sigil.install,
- org.cauldron.sigil.job,
- org.cauldron.sigil.model.project,
- org.cauldron.sigil.model.repository,
- org.cauldron.sigil.model.util,
- org.cauldron.sigil.preferences
+Export-Package: org.apache.felix.sigil.eclipse,
+ org.apache.felix.sigil.eclipse.install,
+ org.apache.felix.sigil.eclipse.job,
+ org.apache.felix.sigil.eclipse.model.project,
+ org.apache.felix.sigil.eclipse.model.repository,
+ org.apache.felix.sigil.eclipse.model.util,
+ org.apache.felix.sigil.eclipse.preferences
Bundle-ClassPath: .,
lib/commons-lang-2.4.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: felix/trunk/sigil/org.cauldron.sigil.core/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/plugin.xml?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/plugin.xml (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/plugin.xml Tue Jul 14 09:23:15 2009
@@ -36,7 +36,7 @@
<extension
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
- class="org.cauldron.sigil.property.SigilPropertyTester"
+ class="org.apache.felix.sigil.property.SigilPropertyTester"
id="org.cauldron.sigil.property.NewtonPropertyTester"
namespace="org.cauldron.sigil"
properties="isNewtonResource,isCompositeResource,isSystemResource,isScriptResource,isSigilProject"
@@ -46,13 +46,13 @@
point="org.eclipse.core.runtime.adapters">
<factory
adaptableType="org.eclipse.core.resources.IFile"
- class="org.cauldron.sigil.internal.adapter.FileAdaptorFactory">
+ class="org.apache.felix.sigil.eclipse.internal.adapter.FileAdaptorFactory">
<adapter type="org.cauldron.sigil.model.eclipse.ISigilBundle"/>
</factory>
<factory
adaptableType="org.eclipse.core.resources.IProject"
- class="org.cauldron.sigil.internal.adapter.ProjectAdaptorFactory">
- <adapter type="org.cauldron.sigil.model.project.ISigilProjectModel"/>
+ class="org.apache.felix.sigil.eclipse.internal.adapter.ProjectAdaptorFactory">
+ <adapter type="org.apache.felix.sigil.model.project.ISigilProjectModel"/>
</factory>
</extension>
<extension
@@ -60,7 +60,7 @@
name="Sigil Nature"
point="org.eclipse.core.resources.natures">
<runtime>
- <run class="org.cauldron.sigil.nature.SigilProjectNature"/>
+ <run class="org.apache.felix.sigil.nature.SigilProjectNature"/>
</runtime>
</extension>
<extension
@@ -70,19 +70,19 @@
<builder
hasNature="false"
isConfigurable="false">
- <run class="org.cauldron.sigil.internal.builders.SigilIncrementalProjectBuilder"/>
+ <run class="org.apache.felix.sigil.eclipse.internal.builders.SigilIncrementalProjectBuilder"/>
</builder>
</extension>
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
- class="org.cauldron.sigil.preferences.SigilPreferencesInitializer">
+ class="org.apache.felix.sigil.preferences.SigilPreferencesInitializer">
</initializer>
</extension>
<extension
point="org.cauldron.sigil.repositoryprovider">
<provider
- class="org.cauldron.sigil.internal.repository.eclipse.WorkspaceRepositoryProvider"
+ class="org.apache.felix.sigil.eclipse.internal.repository.eclipse.WorkspaceRepositoryProvider"
defaultLevel="-3"
dynamic="false"
id="org.cauldron.sigil.core.workspaceprovider"
Copied: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java (from r793581, felix/trunk/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/SigilCore.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java?p2=felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java&p1=felix/trunk/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/SigilCore.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/SigilCore.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil;
+package org.apache.felix.sigil.eclipse;
import java.io.IOException;
import java.io.InputStream;
@@ -31,25 +31,25 @@
import java.util.ResourceBundle;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.install.IOSGiInstallManager;
-import org.cauldron.sigil.internal.install.OSGiInstallManager;
-import org.cauldron.sigil.internal.model.project.SigilModelRoot;
-import org.cauldron.sigil.internal.model.project.SigilProject;
-import org.cauldron.sigil.internal.model.repository.RepositoryConfiguration;
-import org.cauldron.sigil.internal.repository.eclipse.GlobalRepositoryManager;
-import org.cauldron.sigil.internal.repository.eclipse.SigilRepositoryManager;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.project.ISigilModelRoot;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.repository.IRepositoryConfiguration;
-import org.cauldron.sigil.model.util.JavaHelper;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
-import org.cauldron.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallManager;
+import org.apache.felix.sigil.eclipse.internal.install.OSGiInstallManager;
+import org.apache.felix.sigil.eclipse.internal.model.project.SigilModelRoot;
+import org.apache.felix.sigil.eclipse.internal.model.project.SigilProject;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryConfiguration;
+import org.apache.felix.sigil.eclipse.internal.repository.eclipse.GlobalRepositoryManager;
+import org.apache.felix.sigil.eclipse.internal.repository.eclipse.SigilRepositoryManager;
+import org.apache.felix.sigil.eclipse.model.project.ISigilModelRoot;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryConfiguration;
+import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.repository.ResolutionConfig;
import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import java.util.Map;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
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/install/IOSGiInstallManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
public interface IOSGiInstallManager {
IOSGiInstall findInstall(String id);
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.graphics.Image;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import java.util.Arrays;
import java.util.Map;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import java.util.Arrays;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.sigil.internal.adapter;
+package org.apache.felix.sigil.eclipse.internal.adapter;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-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.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.sigil.internal.adapter;
+package org.apache.felix.sigil.eclipse.internal.adapter;
-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.core.runtime.IAdapterFactory;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.builders;
+package org.apache.felix.sigil.eclipse.internal.builders;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.console.MessageConsole;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.builders;
+package org.apache.felix.sigil.eclipse.internal.builders;
import java.io.File;
import java.util.ArrayList;
@@ -26,11 +26,11 @@
import java.util.Map;
import java.util.Properties;
-import org.cauldron.bld.bnd.BundleBuilder;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
+import org.apache.felix.sigil.bnd.BundleBuilder;
+import org.apache.felix.sigil.config.IBldProject;
+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.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.install;
+package org.apache.felix.sigil.eclipse.internal.install;
import java.util.Collections;
import java.util.Comparator;
@@ -25,11 +25,11 @@
import java.util.LinkedList;
import java.util.Map;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.install.IOSGiInstall;
-import org.cauldron.sigil.install.IOSGiInstallBuilder;
-import org.cauldron.sigil.install.IOSGiInstallManager;
-import org.cauldron.sigil.install.IOSGiInstallType;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallBuilder;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallManager;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallType;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java Tue Jul 14 09:23:15 2009
@@ -17,28 +17,28 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.project;
+package org.apache.felix.sigil.eclipse.internal.model.project;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
-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.ISigilModelRoot;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.repository.IBundleResolver;
-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.ISigilModelRoot;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+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.IBundleResolver;
+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.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.project;
+package org.apache.felix.sigil.eclipse.internal.model.project;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,26 +27,26 @@
import java.util.Arrays;
import java.util.Collection;
-import org.cauldron.bld.config.BldFactory;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.job.ThreadProgressMonitor;
-import org.cauldron.sigil.model.AbstractCompoundModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.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.model.util.JavaHelper;
-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.config.BldFactory;
+import org.apache.felix.sigil.config.IBldProject;
+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.apache.felix.sigil.eclipse.model.util.JavaHelper;
+import org.apache.felix.sigil.model.AbstractCompoundModelElement;
+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.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.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.resources.IProject;
import org.eclipse.core.resources.IResource;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.repository;
+package org.apache.felix.sigil.eclipse.internal.model.repository;
import java.io.File;
import java.io.IOException;
@@ -29,14 +29,14 @@
import java.util.Map;
import java.util.UUID;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryConfiguration;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositorySet;
-import org.cauldron.sigil.model.repository.IRepositoryType;
-import org.cauldron.sigil.model.repository.RepositorySet;
-import org.cauldron.sigil.preferences.PrefsUtils;
-import org.cauldron.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryConfiguration;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositorySet;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+import org.apache.felix.sigil.eclipse.model.repository.RepositorySet;
+import org.apache.felix.sigil.eclipse.preferences.PrefsUtils;
+import org.apache.felix.sigil.repository.IBundleRepository;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.repository;
+package org.apache.felix.sigil.eclipse.internal.model.repository;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositoryType;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
import org.eclipse.jface.preference.PreferenceStore;
public class RepositoryModel implements IRepositoryModel {
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.repository;
+package org.apache.felix.sigil.eclipse.internal.model.repository;
-import org.cauldron.sigil.model.repository.IRepositoryType;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
import org.eclipse.swt.graphics.Image;
public class RepositoryType implements IRepositoryType {
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.List;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.internal.repository.eclipse.SigilRepositoryManager;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.internal.repository.eclipse.SigilRepositoryManager;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.repository.IRepositoryManager;
public class GlobalRepositoryManager extends SigilRepositoryManager implements
IRepositoryManager {
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.io.File;
import java.io.IOException;
@@ -28,15 +28,15 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.install.IOSGiInstall;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.Properties;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
public class OSGiInstallRepositoryProvider implements IRepositoryProvider {
public IBundleRepository createRepository(String id, Properties preferences) {
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -28,15 +28,15 @@
import java.util.Iterator;
import java.util.Properties;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositorySet;
-import org.cauldron.sigil.model.repository.IRepositoryType;
-import org.cauldron.sigil.repository.AbstractRepositoryManager;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IRepositoryProvider;
-import org.cauldron.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositorySet;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+import org.apache.felix.sigil.repository.AbstractRepositoryManager;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.RepositoryException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.ArrayList;
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.cauldron.sigil.repository.AbstractBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.Properties;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.ResourcesPlugin;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java Tue Jul 14 09:23:15 2009
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.cauldron.sigil.job;
+package org.apache.felix.sigil.eclipse.job;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.cauldron.sigil.SigilCore;
-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.IBundleResolver;
-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.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.repository.IBundleResolver;
+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.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.job;
+package org.apache.felix.sigil.eclipse.job;
import org.eclipse.core.runtime.IProgressMonitor;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.sigil.model.project;
+package org.apache.felix.sigil.eclipse.model.project;
import java.util.Collection;
import java.util.List;
-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;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
Modified: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java (original)
+++ felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java Tue Jul 14 09:23:15 2009
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.cauldron.sigil.model.project;
+package org.apache.felix.sigil.eclipse.model.project;
import java.util.Collection;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.model.ICompoundModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.model.ICompoundModelElement;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
Propchange: felix/trunk/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/
------------------------------------------------------------------------------
svn:mergeinfo =