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 [4/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/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/project/SigilProjectWizardSecondPage.java Mon Aug 2 16:10:01 2010
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+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.eclipse.ISigilBundle;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
Modified: felix/trunk/sigil/gogo/junit/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/gogo/junit/sigil.properties?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/gogo/junit/sigil.properties (original)
+++ felix/trunk/sigil/gogo/junit/sigil.properties Mon Aug 2 16:10:01 2010
@@ -12,7 +12,7 @@
-imports: \
junit.framework, \
org.apache.commons.cli, \
- org.apache.felix.sigil.junit.server, \
+ org.apache.felix.sigil.common.junit.server, \
org.apache.tools.ant, \
org.apache.tools.ant.taskdefs.optional.junit, \
org.osgi.framework, \
Modified: felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java (original)
+++ felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/Activator.java Mon Aug 2 16:10:01 2010
@@ -21,7 +21,7 @@ package org.apache.felix.sigil.gogo.juni
import java.util.Hashtable;
import java.util.Map;
-import org.apache.felix.sigil.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Modified: felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java (original)
+++ felix/trunk/sigil/gogo/junit/src/org/apache/felix/sigil/gogo/junit/SigilJunit.java Mon Aug 2 16:10:01 2010
@@ -32,7 +32,7 @@ import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.Parser;
-import org.apache.felix.sigil.junit.server.JUnitService;
+import org.apache.felix.sigil.common.junit.server.JUnitService;
import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
Modified: felix/trunk/sigil/ivy/resolver/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/sigil.properties?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/sigil.properties (original)
+++ felix/trunk/sigil/ivy/resolver/sigil.properties Mon Aug 2 16:10:01 2010
@@ -13,17 +13,17 @@
org.apache.felix.sigil.*, \
-imports: \
- 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.licence, \
+ 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.obr, \
org.apache.felix.sigil.common.osgi, \
- org.apache.felix.sigil.config, \
- org.apache.felix.sigil.core, \
- org.apache.felix.sigil.core.licence, \
- org.apache.felix.sigil.core.repository, \
- 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.apache.ivy, \
org.apache.ivy.core, \
org.apache.ivy.core.module.descriptor, \
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java Mon Aug 2 16:10:01 2010
@@ -26,10 +26,10 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Properties;
-import org.apache.felix.sigil.bnd.BundleBuilder;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.bnd.BundleBuilder;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java Mon Aug 2 16:10:01 2010
@@ -24,10 +24,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.sigil.config.IRepositoryConfig;
-import org.apache.felix.sigil.repository.AbstractRepositoryManager;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
+import org.apache.felix.sigil.common.repository.AbstractRepositoryManager;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
public class BldRepositoryManager extends AbstractRepositoryManager
{
@@ -36,11 +36,11 @@ public class BldRepositoryManager extend
static
{
aliases.put("filesystem",
- "org.apache.felix.sigil.core.repository.FileSystemRepositoryProvider");
- aliases.put("obr", "org.apache.felix.sigil.obr.OBRRepositoryProvider");
+ "org.apache.felix.sigil.common.core.repository.FileSystemRepositoryProvider");
+ aliases.put("obr", "org.apache.felix.sigil.common.obr.OBRRepositoryProvider");
aliases.put("project", "org.apache.felix.sigil.ivy.ProjectRepositoryProvider");
aliases.put("system",
- "org.apache.felix.sigil.core.repository.SystemRepositoryProvider");
+ "org.apache.felix.sigil.common.core.repository.SystemRepositoryProvider");
};
private Map<String, Properties> repos;
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java Mon Aug 2 16:10:01 2010
@@ -23,13 +23,13 @@ package org.apache.felix.sigil.ivy;
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.IResolutionMonitor;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.IResolutionMonitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
public class BldResolver implements IBldResolver
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java Mon Aug 2 16:10:01 2010
@@ -20,9 +20,9 @@
package org.apache.felix.sigil.ivy;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionException;
public interface IBldResolver
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java Mon Aug 2 16:10:01 2010
@@ -29,20 +29,20 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+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.VersionRange;
import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
-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.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java Mon Aug 2 16:10:01 2010
@@ -23,9 +23,9 @@ package org.apache.felix.sigil.ivy;
import java.util.HashMap;
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 ProjectRepositoryProvider implements IRepositoryProvider
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java Mon Aug 2 16:10:01 2010
@@ -31,15 +31,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.model.IModelElement;
+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.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.common.repository.IResolution;
import org.apache.ivy.Ivy;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.module.descriptor.Artifact;
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java?rev=981577&r1=981576&r2=981577&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java Mon Aug 2 16:10:01 2010
@@ -37,15 +37,15 @@ import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.model.IModelElement;
+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.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionException;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;