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 2010/08/02 18:10:09 UTC
svn commit: r981577 [2/4] - in /felix/trunk/sigil:
common/core.tests/src/org/apache/felix/sigil/common/
common/core.tests/src/org/apache/felix/sigil/common/core/
common/core.tests/src/org/apache/felix/sigil/common/core/internal/
common/core.tests/src/o...
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java Mon Aug 2 16:10:01 2010
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.File;
import java.io.IOException;
import java.util.jar.JarFile;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
public class SystemRepository extends AbstractBundleRepository
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.File;
@@ -26,9 +26,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
public class SystemRepositoryProvider implements IRepositoryProvider
{
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java Mon Aug 2 16:10:01 2010
@@ -1,19 +1,19 @@
-package org.apache.felix.sigil.core.util;
+package org.apache.felix.sigil.common.core.util;
import java.util.Arrays;
import java.util.Collection;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-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 class ManifestUtil
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.util;
+package org.apache.felix.sigil.common.core.util;
import java.util.ArrayList;
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.HashMap;
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.io.Serializable;
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface ICapabilityModelElement extends IModelElement
{
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.Set;
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.Map;
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface IModelInfo
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
/**
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface INamedModelElement extends IModelElement
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface IRequirementModelElement extends IModelElement
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
/**
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.HashMap;
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public class ModelElementFactoryException extends RuntimeException
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.io.Serializable;
@@ -35,7 +35,7 @@ import java.util.Set;
import java.util.WeakHashMap;
import java.util.logging.Logger;
-import org.apache.felix.sigil.model.annotations.Required;
+import org.apache.felix.sigil.common.model.annotations.Required;
public class ModelElementSupport implements Serializable
Copied: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java (from r981424, felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java?p2=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java&p1=felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.HashMap;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.annotations;
+package org.apache.felix.sigil.common.model.annotations;
import java.lang.annotation.Documented;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java Mon Aug 2 16:10:01 2010
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
import org.osgi.framework.Version;
public interface IBundleCapability extends ICapabilityModelElement
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java Mon Aug 2 16:10:01 2010
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
import java.util.Collection;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.osgi.framework.Version;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java Mon Aug 2 16:10:01 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
+import org.apache.felix.sigil.common.model.IModelElement;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.IModelElement;
public interface ILibraryImport extends IModelElement
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
import java.io.File;
@@ -25,12 +25,12 @@ import java.io.IOException;
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.config.Resource;
-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;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IVersionedModelElement;
/**
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import java.net.URI;
import java.util.Collection;
import java.util.Set;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.INamedModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.INamedModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
import org.osgi.framework.Version;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java Mon Aug 2 16:10:01 2010
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import java.util.Collection;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
import org.osgi.framework.Version;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java Mon Aug 2 16:10:01 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
-import org.apache.felix.sigil.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
public interface IPackageImport extends IPackageModelElement, IVersionRangeModelElement, IRequirementModelElement,
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
public interface IPackageModelElement extends IModelElement
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java Mon Aug 2 16:10:01 2010
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IRequirementModelElement;
public interface IRequiredBundle extends IModelElement, IRequirementModelElement, Comparable<IRequiredBundle>
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import org.apache.felix.sigil.common.osgi.VersionRange;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import org.osgi.framework.Version;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.io.IOException;
@@ -27,17 +27,17 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.jar.Manifest;
-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.ManifestUtil;
-import org.apache.felix.sigil.model.IModelElement;
-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.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.core.licence.ILicenseManager;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.core.util.ManifestUtil;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
public abstract class AbstractBundleRepository implements IBundleRepository
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.ArrayList;
@@ -31,12 +31,12 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-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;
+import org.apache.felix.sigil.common.core.repository.BundleResolver;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.RepositoryChangeEvent.Type;
public abstract class AbstractRepositoryManager implements IRepositoryManager, IBundleRepositoryListener
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java Mon Aug 2 16:10:01 2010
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
-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;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
public interface IBundleRepository
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public interface IBundleRepositoryListener
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java Mon Aug 2 16:10:01 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
public interface IBundleResolver
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public interface IProviderChangeListener
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public interface IRepositoryChangeListener
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java Mon Aug 2 16:10:01 2010
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.Collection;
-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.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
public interface IRepositoryManager
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.Properties;
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java Mon Aug 2 16:10:01 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public interface IRepositoryVisitor
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java Mon Aug 2 16:10:01 2010
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public interface IResolution
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java Mon Aug 2 16:10:01 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public interface IResolutionMonitor
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public class RepositoryChangeEvent
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public class RepositoryException extends Exception
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public class ResolutionConfig
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java Mon Aug 2 16:10:01 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
public class ResolutionException extends Exception
Modified: felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java (original)
+++ felix/trunk/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java Mon Aug 2 16:10:01 2010
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public class ResolutionMonitorAdapter implements IResolutionMonitor
Modified: felix/trunk/sigil/common/junit/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/sigil.properties?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/sigil.properties (original)
+++ felix/trunk/sigil/common/junit/sigil.properties Mon Aug 2 16:10:01 2010
@@ -1,7 +1,7 @@
# sigil project file, saved by plugin.
--activator: org.apache.felix.sigil.junit.activator.Activator
+-activator: org.apache.felix.sigil.common.junit.activator.Activator
-bundles: \
org.apache.felix.sigil.common.junit, \
@@ -10,11 +10,11 @@
src, \
-exports: \
- org.apache.felix.sigil.junit.server, \
+ org.apache.felix.sigil.common.junit.server, \
-imports: \
junit.framework, \
- org.apache.felix.sigil.junit.server, \
+ org.apache.felix.sigil.common.junit.server, \
org.osgi.framework, \
org.osgi.util.tracker, \
Copied: felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/AbstractSigilTestCase.java (from r981424, felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/AbstractSigilTestCase.java?p2=felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/AbstractSigilTestCase.java&p1=felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/AbstractSigilTestCase.java (original)
+++ felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/AbstractSigilTestCase.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.junit;
+package org.apache.felix.sigil.common.junit;
import java.lang.reflect.Method;
Copied: felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/ReflectiveSigilTestCase.java (from r981424, felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/ReflectiveSigilTestCase.java?p2=felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/ReflectiveSigilTestCase.java&p1=felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/ReflectiveSigilTestCase.java (original)
+++ felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/ReflectiveSigilTestCase.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.junit;
+package org.apache.felix.sigil.common.junit;
import java.lang.reflect.Method;
Modified: felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/activator/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/activator/Activator.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/activator/Activator.java (original)
+++ felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/activator/Activator.java Mon Aug 2 16:10:01 2010
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.junit.activator;
+package org.apache.felix.sigil.common.junit.activator;
-import org.apache.felix.sigil.junit.server.JUnitService;
-import org.apache.felix.sigil.junit.server.impl.JUnitServiceFactory;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.impl.JUnitServiceFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Copied: felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/JUnitService.java (from r981424, felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/JUnitService.java?p2=felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/JUnitService.java&p1=felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/junit/server/JUnitService.java (original)
+++ felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/JUnitService.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.junit.server;
+package org.apache.felix.sigil.common.junit.server;
import java.util.Set;
Modified: felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceFactory.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceFactory.java (original)
+++ felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceFactory.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.junit.server.impl;
+package org.apache.felix.sigil.common.junit.server.impl;
import java.util.HashMap;
Modified: felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceImpl.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceImpl.java (original)
+++ felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/JUnitServiceImpl.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.junit.server.impl;
+package org.apache.felix.sigil.common.junit.server.impl;
import java.lang.reflect.InvocationTargetException;
@@ -32,7 +32,7 @@ import junit.framework.Test;
import junit.framework.TestResult;
import junit.framework.TestSuite;
-import org.apache.felix.sigil.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
import org.osgi.framework.BundleContext;
Modified: felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/TestClassListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/TestClassListener.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/TestClassListener.java (original)
+++ felix/trunk/sigil/common/junit/src/org/apache/felix/sigil/common/junit/server/impl/TestClassListener.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.junit.server.impl;
+package org.apache.felix.sigil.common.junit.server.impl;
import java.lang.reflect.Modifier;
Modified: felix/trunk/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java (original)
+++ felix/trunk/sigil/common/obr.test/src/org/apache/felix/sigil/obr/impl/VersionRangeHelperTest.java Mon Aug 2 16:10:01 2010
@@ -19,6 +19,7 @@
package org.apache.felix.sigil.obr.impl;
+import org.apache.felix.sigil.common.obr.impl.VersionRangeHelper;
import org.apache.felix.sigil.common.osgi.LDAPExpr;
import org.apache.felix.sigil.common.osgi.LDAPParser;
import org.apache.felix.sigil.common.osgi.VersionRange;
Modified: felix/trunk/sigil/common/obr/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/sigil.properties?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/sigil.properties (original)
+++ felix/trunk/sigil/common/obr/sigil.properties Mon Aug 2 16:10:01 2010
@@ -8,15 +8,15 @@
src, \
-exports: \
- org.apache.felix.sigil.obr, \
+ org.apache.felix.sigil.common.obr, \
-imports: \
+ org.apache.felix.sigil.common.model, \
+ org.apache.felix.sigil.common.model.eclipse, \
+ org.apache.felix.sigil.common.model.osgi, \
+ org.apache.felix.sigil.common.obr, \
org.apache.felix.sigil.common.osgi, \
- org.apache.felix.sigil.model, \
- org.apache.felix.sigil.model.eclipse, \
- org.apache.felix.sigil.model.osgi, \
- org.apache.felix.sigil.obr, \
- org.apache.felix.sigil.repository, \
+ org.apache.felix.sigil.common.repository, \
org.eclipse.core.runtime, \
org.osgi.framework, \
Copied: felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/OBRRepositoryProvider.java (from r981424, felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/OBRRepositoryProvider.java?p2=felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/OBRRepositoryProvider.java&p1=felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java&r1=981424&r2=981577&rev=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java (original)
+++ felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/OBRRepositoryProvider.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.obr;
+package org.apache.felix.sigil.common.obr;
import java.io.File;
import java.io.IOException;
@@ -25,11 +25,11 @@ import java.net.URL;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.felix.sigil.obr.impl.CachingOBRBundleRepository;
-import org.apache.felix.sigil.obr.impl.NonCachingOBRBundleRepository;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.obr.impl.CachingOBRBundleRepository;
+import org.apache.felix.sigil.common.obr.impl.NonCachingOBRBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
public class OBRRepositoryProvider implements IRepositoryProvider
{
Modified: felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/AbstractOBRBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/AbstractOBRBundleRepository.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/AbstractOBRBundleRepository.java (original)
+++ felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/AbstractOBRBundleRepository.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -34,7 +34,7 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
import org.xml.sax.SAXException;
public abstract class AbstractOBRBundleRepository extends AbstractBundleRepository
Modified: felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/CachingOBRBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/CachingOBRBundleRepository.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/CachingOBRBundleRepository.java (original)
+++ felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/CachingOBRBundleRepository.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
import java.io.File;
import java.lang.ref.SoftReference;
@@ -25,8 +25,8 @@ import java.net.URL;
import java.util.LinkedList;
import java.util.List;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
public class CachingOBRBundleRepository extends AbstractOBRBundleRepository
{
Modified: felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/NonCachingOBRBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/NonCachingOBRBundleRepository.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/NonCachingOBRBundleRepository.java (original)
+++ felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/NonCachingOBRBundleRepository.java Mon Aug 2 16:10:01 2010
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
import java.io.File;
import java.net.URL;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
public class NonCachingOBRBundleRepository extends AbstractOBRBundleRepository
{
Modified: felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRHandler.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRHandler.java (original)
+++ felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRHandler.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
import java.io.File;
@@ -29,18 +29,18 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.LDAPExpr;
import org.apache.felix.sigil.common.osgi.LDAPParseException;
import org.apache.felix.sigil.common.osgi.LDAPParser;
import org.apache.felix.sigil.common.osgi.SimpleTerm;
import org.apache.felix.sigil.common.osgi.VersionRange;
import org.apache.felix.sigil.common.osgi.VersionTable;
-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.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.xml.sax.Attributes;
Modified: felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRListener.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRListener.java (original)
+++ felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/OBRListener.java Mon Aug 2 16:10:01 2010
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public interface OBRListener
Modified: felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/VersionRangeHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/VersionRangeHelper.java?rev=981577&r1=981424&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/VersionRangeHelper.java (original)
+++ felix/trunk/sigil/common/obr/src/org/apache/felix/sigil/common/obr/impl/VersionRangeHelper.java Mon Aug 2 16:10:01 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.obr.impl;
+package org.apache.felix.sigil.common.obr.impl;
import java.util.ArrayList;
Modified: felix/trunk/sigil/eclipse/core/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/plugin.xml?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/plugin.xml (original)
+++ felix/trunk/sigil/eclipse/core/plugin.xml Mon Aug 2 16:10:01 2010
@@ -78,13 +78,13 @@
type="Workspace Repository">
</provider>
<provider
- class="org.apache.felix.sigil.core.repository.FileSystemRepositoryProvider"
+ class="org.apache.felix.sigil.common.core.repository.FileSystemRepositoryProvider"
dynamic="true"
id="org.apache.felix.sigil.core.file"
type="File System Repository">
</provider>
<provider
- class="org.apache.felix.sigil.core.repository.SystemRepositoryProvider"
+ class="org.apache.felix.sigil.common.core.repository.SystemRepositoryProvider"
dynamic="false"
id="org.apache.felix.sigil.core.system"
type="System Repository">
Modified: felix/trunk/sigil/eclipse/core/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/sigil.properties?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/sigil.properties (original)
+++ felix/trunk/sigil/eclipse/core/sigil.properties Mon Aug 2 16:10:01 2010
@@ -29,11 +29,15 @@
-imports: \
org.apache.commons.lang, \
org.apache.commons.lang.text, \
- org.apache.felix.sigil.bnd, \
+ org.apache.felix.sigil.common.bnd, \
+ org.apache.felix.sigil.common.config, \
+ org.apache.felix.sigil.common.core, \
+ org.apache.felix.sigil.common.core.repository, \
+ org.apache.felix.sigil.common.model, \
+ org.apache.felix.sigil.common.model.eclipse, \
+ org.apache.felix.sigil.common.model.osgi, \
org.apache.felix.sigil.common.osgi, \
- org.apache.felix.sigil.config, \
- org.apache.felix.sigil.core, \
- org.apache.felix.sigil.core.repository, \
+ org.apache.felix.sigil.common.repository, \
org.apache.felix.sigil.eclipse, \
org.apache.felix.sigil.eclipse.install, \
org.apache.felix.sigil.eclipse.job, \
@@ -41,10 +45,6 @@
org.apache.felix.sigil.eclipse.model.repository, \
org.apache.felix.sigil.eclipse.model.util, \
org.apache.felix.sigil.eclipse.preferences, \
- org.apache.felix.sigil.model, \
- org.apache.felix.sigil.model.eclipse, \
- org.apache.felix.sigil.model.osgi, \
- org.apache.felix.sigil.repository, \
org.apache.felix.sigil.utils, \
org.eclipse.core.commands.common;resolve=compile, \
org.eclipse.core.expressions, \
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java Mon Aug 2 16:10:01 2010
@@ -33,8 +33,15 @@ import java.util.ResourceBundle;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
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;
@@ -49,13 +56,6 @@ import org.apache.felix.sigil.eclipse.mo
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.ICapabilityModelElement;
-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;
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java Mon Aug 2 16:10:01 2010
@@ -20,11 +20,11 @@
package org.apache.felix.sigil.eclipse.internal.adapter;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
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/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java Mon Aug 2 16:10:01 2010
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.sigil.bnd.BundleBuilder;
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.bnd.BundleBuilder;
+import org.apache.felix.sigil.common.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;
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java Mon Aug 2 16:10:01 2010
@@ -26,22 +26,22 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.repository.IBundleResolver;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
+import org.apache.felix.sigil.common.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.ICapabilityModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-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.IPackageImport;
-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/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java Mon Aug 2 16:10:01 2010
@@ -33,29 +33,29 @@ import java.util.LinkedList;
import java.util.List;
import java.util.regex.Matcher;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.ResolutionMonitorAdapter;
import org.apache.felix.sigil.eclipse.PathUtil;
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.ICapabilityModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-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.apache.felix.sigil.utils.GlobCompiler;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java Mon Aug 2 16:10:01 2010
@@ -22,10 +22,10 @@ package org.apache.felix.sigil.eclipse.i
import java.util.List;
+import org.apache.felix.sigil.common.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/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java Mon Aug 2 16:10:01 2010
@@ -29,15 +29,15 @@ import java.util.Map;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
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/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java Mon Aug 2 16:10:01 2010
@@ -22,8 +22,8 @@ package org.apache.felix.sigil.eclipse.i
import java.util.Properties;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
public class OSGiInstallRepositoryProvider implements IRepositoryProvider
Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/RepositoryMap.java Mon Aug 2 16:10:01 2010
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Properties;
-import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
public class RepositoryMap
{