You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/07/14 11:23:28 UTC
svn commit: r793825 [2/6] - in /felix/trunk/sigil: bld-ivy/src/org/apache/
bld-ivy/src/org/apache/felix/ bld-ivy/src/org/apache/felix/sigil/
bld-ivy/src/org/apache/felix/sigil/ant/
bld-ivy/src/org/apache/felix/sigil/ivy/ bld-ivy/src/org/cauldron/bld/an...
Modified: felix/trunk/sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/ConfigTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/ConfigTest.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/ConfigTest.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core.tests/src/org/apache/felix/sigil/core/ConfigTest.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.core;
+package org.apache.felix.sigil.core;
import java.io.IOException;
import java.net.URI;
@@ -25,13 +25,13 @@
import junit.framework.TestCase;
-import org.cauldron.bld.config.BldFactory;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.bld.core.internal.model.osgi.PackageImport;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.config.BldFactory;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
public class ConfigTest extends TestCase {
Modified: felix/trunk/sigil/org.cauldron.bld.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/META-INF/MANIFEST.MF?rev=793825&r1=793824&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/META-INF/MANIFEST.MF (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/META-INF/MANIFEST.MF Tue Jul 14 09:23:15 2009
@@ -4,18 +4,18 @@
Bundle-SymbolicName: org.cauldron.bld.core;singleton:=true
Bundle-Version: 0.8.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.cauldron.bld.core.BldCore
+Bundle-Activator: org.apache.felix.sigil.core.BldCore
Bundle-ActivationPolicy: lazy
-Export-Package: org.cauldron.bld.bnd,
- org.cauldron.bld.config,
- org.cauldron.bld.core,
- org.cauldron.bld.core.licence,
- org.cauldron.bld.core.repository,
- org.cauldron.sigil.model,
- org.cauldron.sigil.model.common,
- org.cauldron.sigil.model.eclipse,
- org.cauldron.sigil.model.osgi,
- org.cauldron.sigil.repository
+Export-Package: org.apache.felix.sigil.bnd,
+ 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.common,
+ org.apache.felix.sigil.model.eclipse,
+ org.apache.felix.sigil.model.osgi,
+ org.apache.felix.sigil.repository
Import-Package: org.osgi.framework
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.4.0"
Bundle-ClassPath: lib/bndlib.jar,
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/bnd/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/bnd/BundleBuilder.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/bnd/BundleBuilder.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/bnd/BundleBuilder.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.bnd;
+package org.apache.felix.sigil.bnd;
import static java.lang.String.format;
@@ -36,15 +36,15 @@
import java.util.Set;
import java.util.jar.Attributes;
-import org.cauldron.bld.config.BldAttr;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.bld.config.IBldProject.IBldBundle;
-import org.cauldron.bld.core.internal.model.osgi.PackageImport;
-import org.cauldron.bld.core.repository.SystemRepositoryProvider;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.config.BldAttr;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.core.repository.SystemRepositoryProvider;
+import org.apache.felix.sigil.model.common.VersionRange;
+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;
import aQute.lib.osgi.Builder;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldAttr.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldAttr.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldAttr.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldAttr.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
public class BldAttr {
// Sigil attributes
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConfig.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConfig.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConfig.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,7 +29,7 @@
import java.util.Properties;
import java.util.TreeMap;
-import org.cauldron.bld.core.util.QuoteUtil;
+import org.apache.felix.sigil.core.util.QuoteUtil;
public class BldConfig {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConverter.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConverter.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConverter.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldConverter.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
import java.net.URI;
import java.util.ArrayList;
@@ -30,17 +30,17 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.cauldron.bld.config.IBldProject.IBldBundle;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.bld.core.internal.model.eclipse.SigilBundle;
-import org.cauldron.bld.core.internal.model.osgi.BundleModelElement;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.eclipse.ISCAComposite;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.core.internal.model.eclipse.SigilBundle;
+import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.eclipse.ISCAComposite;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.osgi.framework.Version;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldFactory.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldFactory.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldFactory.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
import java.io.File;
import java.io.IOException;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldProject.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldProject.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldProject.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
@@ -41,19 +41,19 @@
import java.util.Properties;
import java.util.TreeSet;
-import org.cauldron.bld.bnd.BundleBuilder;
-import org.cauldron.bld.core.internal.model.osgi.BundleModelElement;
-import org.cauldron.bld.core.internal.model.osgi.PackageExport;
-import org.cauldron.bld.core.internal.model.osgi.PackageImport;
-import org.cauldron.bld.core.internal.model.osgi.RequiredBundle;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.osgi.IPackageImport.OSGiImport;
+import org.apache.felix.sigil.bnd.BundleBuilder;
+import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.core.internal.model.osgi.PackageExport;
+import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.model.osgi.IPackageImport.OSGiImport;
import org.osgi.framework.Version;
public class BldProject implements IBldProject, IRepositoryConfig {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldUtil.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldUtil.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/BldUtil.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
import java.util.Map;
import java.util.Properties;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IBldProject.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IBldProject.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IBldProject.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IBldProject.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
import java.io.File;
import java.io.IOException;
@@ -26,11 +26,11 @@
import java.util.Map;
import java.util.Properties;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.model.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;
public interface IBldProject {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IRepositoryConfig.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IRepositoryConfig.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/config/IRepositoryConfig.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.config;
+package org.apache.felix.sigil.config;
import java.util.Map;
import java.util.Properties;
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/BldCore.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/bld/core/BldCore.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/BldCore.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/BldCore.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/bld/core/BldCore.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/bld/core/BldCore.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/BldCore.java Tue Jul 14 09:23:15 2009
@@ -17,32 +17,32 @@
* under the License.
*/
-package org.cauldron.bld.core;
+package org.apache.felix.sigil.core;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.cauldron.bld.core.internal.license.LicenseManager;
-import org.cauldron.bld.core.internal.model.eclipse.DownloadJar;
-import org.cauldron.bld.core.internal.model.eclipse.Library;
-import org.cauldron.bld.core.internal.model.eclipse.LibraryImport;
-import org.cauldron.bld.core.internal.model.eclipse.SigilBundle;
-import org.cauldron.bld.core.internal.model.osgi.BundleModelElement;
-import org.cauldron.bld.core.internal.model.osgi.PackageExport;
-import org.cauldron.bld.core.internal.model.osgi.PackageImport;
-import org.cauldron.bld.core.internal.model.osgi.RequiredBundle;
-import org.cauldron.bld.core.licence.ILicenseManager;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.eclipse.IDownloadJar;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
-import org.cauldron.sigil.model.eclipse.INewtonSystem;
-import org.cauldron.sigil.model.eclipse.ISCAComposite;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.core.internal.license.LicenseManager;
+import org.apache.felix.sigil.core.internal.model.eclipse.DownloadJar;
+import org.apache.felix.sigil.core.internal.model.eclipse.Library;
+import org.apache.felix.sigil.core.internal.model.eclipse.LibraryImport;
+import org.apache.felix.sigil.core.internal.model.eclipse.SigilBundle;
+import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.core.internal.model.osgi.PackageExport;
+import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
+import org.apache.felix.sigil.core.licence.ILicenseManager;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.eclipse.IDownloadJar;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.model.eclipse.INewtonSystem;
+import org.apache.felix.sigil.model.eclipse.ISCAComposite;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/BldCore.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,15 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.license;
+package org.apache.felix.sigil.core.internal.license;
import java.util.Collections;
import java.util.HashMap;
import java.util.Set;
import java.util.regex.Pattern;
-import org.cauldron.bld.core.licence.ILicenseManager;
-import org.cauldron.bld.core.licence.ILicensePolicy;
-//import org.cauldron.sigil.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.core.licence.ILicenseManager;
+import org.apache.felix.sigil.core.licence.ILicensePolicy;
public class LicenseManager implements ILicenseManager {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.license;
+package org.apache.felix.sigil.core.internal.license;
-import org.cauldron.bld.core.licence.ILicensePolicy;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.eclipse.core.runtime.IProgressMonitor;
public class LicensePolicy implements ILicensePolicy {
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/DownloadJar.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.eclipse;
+package org.apache.felix.sigil.core.internal.model.eclipse;
import java.util.HashSet;
import java.util.Set;
-import org.cauldron.sigil.model.AbstractCompoundModelElement;
-import org.cauldron.sigil.model.eclipse.IDownloadJar;
+import org.apache.felix.sigil.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.model.eclipse.IDownloadJar;
import org.eclipse.core.runtime.IPath;
public class DownloadJar extends AbstractCompoundModelElement implements IDownloadJar {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java Tue Jul 14 09:23:15 2009
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.eclipse;
+package org.apache.felix.sigil.core.internal.model.eclipse;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.cauldron.sigil.model.AbstractCompoundModelElement;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
public class Library extends AbstractCompoundModelElement implements ILibrary {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.eclipse;
+package org.apache.felix.sigil.core.internal.model.eclipse;
-import org.cauldron.sigil.model.AbstractModelElement;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.model.AbstractModelElement;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
public class LibraryImport extends AbstractModelElement implements ILibraryImport {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.eclipse;
+package org.apache.felix.sigil.core.internal.model.eclipse;
import java.io.File;
import java.io.FileOutputStream;
@@ -32,14 +32,14 @@
import java.util.HashSet;
import java.util.Set;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.model.AbstractCompoundModelElement;
-import org.cauldron.sigil.model.eclipse.IDownloadJar;
-import org.cauldron.sigil.model.eclipse.ISCAComposite;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.model.eclipse.IDownloadJar;
+import org.apache.felix.sigil.model.eclipse.ISCAComposite;
+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.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.osgi;
+package org.apache.felix.sigil.core.internal.model.osgi;
import java.net.URI;
import java.util.Collection;
@@ -25,13 +25,13 @@
import java.util.HashSet;
import java.util.Set;
-import org.cauldron.sigil.model.AbstractCompoundModelElement;
-import org.cauldron.sigil.model.InvalidModelException;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.model.InvalidModelException;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+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 BundleModelElement extends AbstractCompoundModelElement implements IBundleModelElement {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.osgi;
+package org.apache.felix.sigil.core.internal.model.osgi;
import java.util.Collection;
import java.util.HashSet;
-import org.cauldron.sigil.model.AbstractModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.AbstractModelElement;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
import org.osgi.framework.Version;
public class PackageExport extends AbstractModelElement implements IPackageExport {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.osgi;
+package org.apache.felix.sigil.core.internal.model.osgi;
-import org.cauldron.sigil.model.AbstractModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.InvalidModelException;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.AbstractModelElement;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.InvalidModelException;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
public class PackageImport extends AbstractModelElement implements IPackageImport {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.bld.core.internal.model.osgi;
+package org.apache.felix.sigil.core.internal.model.osgi;
-import org.cauldron.sigil.model.AbstractModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.model.AbstractModelElement;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
public class RequiredBundle extends AbstractModelElement implements IRequiredBundle {
private static final long serialVersionUID = 1L;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.core.licence;
+package org.apache.felix.sigil.core.licence;
import java.util.Set;
import java.util.regex.Pattern;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.bld.core.licence;
+package org.apache.felix.sigil.core.licence;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.eclipse.core.runtime.IProgressMonitor;
public interface ILicensePolicy {
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/BundleResolver.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/BundleResolver.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/BundleResolver.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.core.repository;
+package org.apache.felix.sigil.core.repository;
import java.io.IOException;
import java.util.ArrayList;
@@ -31,24 +31,24 @@
import java.util.Map;
import java.util.Set;
-import org.cauldron.bld.core.BldCore;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.model.ICompoundModelElement;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ILibrary;
+import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IBundleResolver;
+import org.apache.felix.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.repository.IResolutionMonitor;
+import org.apache.felix.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.repository.ResolutionException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
-import org.cauldron.sigil.model.ICompoundModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IBundleResolver;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IResolution;
-import org.cauldron.sigil.repository.IResolutionMonitor;
-import org.cauldron.sigil.repository.ResolutionConfig;
-import org.cauldron.sigil.repository.ResolutionException;
import org.osgi.framework.Version;
public class BundleResolver implements IBundleResolver {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.core.repository;
+package org.apache.felix.sigil.core.repository;
import java.io.File;
import java.io.IOException;
@@ -25,12 +25,12 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
+import org.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.repository.AbstractBundleRepository;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java Tue Jul 14 09:23:15 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.bld.core.repository;
+package org.apache.felix.sigil.core.repository;
import java.util.ArrayList;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
import org.eclipse.core.runtime.IPath;
public class FileSystemRepository extends AbstractBundleRepository {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java Tue Jul 14 09:23:15 2009
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.cauldron.bld.core.repository;
+package org.apache.felix.sigil.core.repository;
import java.io.File;
import java.util.Properties;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
-import org.cauldron.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.RepositoryException;
import org.eclipse.core.runtime.Path;
public class FileSystemRepositoryProvider implements IRepositoryProvider {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.bld.core.repository;
+package org.apache.felix.sigil.core.repository;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.cauldron.sigil.repository.IResolutionMonitor;
+import org.apache.felix.sigil.repository.IResolutionMonitor;
public class ProgressWrapper implements IProgressMonitor {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepository.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepository.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepository.java Tue Jul 14 09:23:15 2009
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.cauldron.bld.core.repository;
+package org.apache.felix.sigil.core.repository;
import java.io.IOException;
import java.util.jar.JarFile;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+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.eclipse.core.runtime.IPath;
public class SystemRepository extends AbstractBundleRepository {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java Tue Jul 14 09:23:15 2009
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.cauldron.bld.core.repository;
+package org.apache.felix.sigil.core.repository;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
-import org.cauldron.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.RepositoryException;
import org.eclipse.core.runtime.Path;
public class SystemRepositoryProvider implements IRepositoryProvider {
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/util/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/util/QuoteUtil.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/util/QuoteUtil.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/core/util/QuoteUtil.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.core.util;
+package org.apache.felix.sigil.core.util;
import java.util.ArrayList;
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/AbstractCompoundModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/AbstractCompoundModelElement.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/AbstractCompoundModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.util.HashMap;
import java.util.HashSet;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractModelElement.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/AbstractModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractModelElement.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractModelElement.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/AbstractModelElement.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/AbstractModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.io.Serializable;
import java.util.Collections;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/AbstractModelElement.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ICompoundModelElement.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ICompoundModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ICompoundModelElement.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ICompoundModelElement.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ICompoundModelElement.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ICompoundModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ICompoundModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.util.Set;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependency.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependency.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependency.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependency.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependency.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependency.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependency.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public interface IDependency extends IModelElement {
IDependent getDependent();
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependency.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependent.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependent.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependent.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependent.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependent.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependent.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependent.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public interface IDependent extends IModelElement {
IDependency getDepender();
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependentModelElement.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependentModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependentModelElement.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependentModelElement.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependentModelElement.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IDependentModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependentModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public interface IDependentModelElement extends IModelElement {
/**
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IDependentModelElement.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelElement.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelElement.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelElement.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelElement.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.util.Map;
import java.util.Set;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelElement.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelInfo.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelInfo.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelInfo.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelInfo.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelInfo.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelInfo.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelInfo.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public interface IModelInfo {
String getGroupName();
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelInfo.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelWalker.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelWalker.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelWalker.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelWalker.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelWalker.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IModelWalker.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelWalker.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public interface IModelWalker {
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IModelWalker.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/INamedModelElement.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/INamedModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/INamedModelElement.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/INamedModelElement.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/INamedModelElement.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/INamedModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/INamedModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public interface INamedModelElement extends IModelElement {
void setName(String name);
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/INamedModelElement.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IRequirementModelElement.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IRequirementModelElement.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IRequirementModelElement.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IRequirementModelElement.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IRequirementModelElement.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/IRequirementModelElement.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IRequirementModelElement.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public interface IRequirementModelElement {
boolean accepts(IModelElement provider);
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/InvalidModelException.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/InvalidModelException.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/InvalidModelException.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/InvalidModelException.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/InvalidModelException.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/InvalidModelException.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/InvalidModelException.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
/**
* @author dave
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/InvalidModelException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactory.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementFactory.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactory.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactory.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementFactory.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementFactory.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactory.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.util.HashMap;
import java.util.Map;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactory.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementFactoryException.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementFactoryException.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementFactoryException.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
public class ModelElementFactoryException extends RuntimeException {
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementSupport.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementSupport.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementSupport.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementSupport.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementSupport.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/ModelElementSupport.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementSupport.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.io.Serializable;
import java.lang.ref.SoftReference;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/ModelElementSupport.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/OverrideOptions.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/OverrideOptions.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/OverrideOptions.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/OverrideOptions.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/OverrideOptions.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/OverrideOptions.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/OverrideOptions.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.util.HashMap;
import java.util.Map;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/OverrideOptions.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/Required.java (from r793581, felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/Required.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/Required.java?p2=felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/Required.java&p1=felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/Required.java&r1=793581&r2=793825&rev=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/cauldron/sigil/model/Required.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/Required.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model;
+package org.apache.felix.sigil.model;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/Required.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/And.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/And.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/And.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/And.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.util.Map;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Cardinality.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Cardinality.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Cardinality.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Cardinality.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.io.Serializable;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ExprVisitor.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ExprVisitor.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ExprVisitor.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ExprVisitor.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
public interface ExprVisitor {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Expressions.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Expressions.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Expressions.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Expressions.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.util.Map;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/FilterValidator.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/FilterValidator.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/FilterValidator.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/FilterValidator.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
public interface FilterValidator {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPExpr.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPExpr.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPExpr.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPExpr.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.io.Serializable;
import java.util.Map;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParseException.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParseException.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParseException.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParseException.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
public class LDAPParseException extends Exception {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParser.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParser.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/LDAPParser.java Tue Jul 14 09:23:15 2009
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
-import static org.cauldron.sigil.model.common.Expressions.and;
-import static org.cauldron.sigil.model.common.Expressions.not;
-import static org.cauldron.sigil.model.common.Expressions.or;
-import static org.cauldron.sigil.model.common.Ops.APPROX;
-import static org.cauldron.sigil.model.common.Ops.EQ;
-import static org.cauldron.sigil.model.common.Ops.GE;
-import static org.cauldron.sigil.model.common.Ops.GT;
-import static org.cauldron.sigil.model.common.Ops.LE;
-import static org.cauldron.sigil.model.common.Ops.LT;
+import static org.apache.felix.sigil.model.common.Expressions.and;
+import static org.apache.felix.sigil.model.common.Expressions.not;
+import static org.apache.felix.sigil.model.common.Expressions.or;
+import static org.apache.felix.sigil.model.common.Ops.APPROX;
+import static org.apache.felix.sigil.model.common.Ops.EQ;
+import static org.apache.felix.sigil.model.common.Ops.GE;
+import static org.apache.felix.sigil.model.common.Ops.GT;
+import static org.apache.felix.sigil.model.common.Ops.LE;
+import static org.apache.felix.sigil.model.common.Ops.LT;
import java.util.ArrayList;
import java.util.List;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Not.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Not.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Not.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Not.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.util.Map;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Ops.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Ops.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Ops.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Ops.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
public enum Ops {
EQ, GE, LE, GT, LT, APPROX;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Or.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Or.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Or.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Or.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.util.Map;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ParseState.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ParseState.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ParseState.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/ParseState.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.io.Serializable;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/SimpleTerm.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/SimpleTerm.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/SimpleTerm.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/SimpleTerm.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.lang.reflect.Constructor;
import java.util.Iterator;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Utils.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Utils.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Utils.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/Utils.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.util.ArrayList;
import java.util.Collections;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRange.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRange.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRange.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRange.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
import java.io.Serializable;
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/common/VersionRangeBoundingRule.java Tue Jul 14 09:23:15 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.common;
+package org.apache.felix.sigil.model.common;
public enum VersionRangeBoundingRule {
Exact, Micro, Minor, Major, Any
Propchange: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/IDownloadJar.java Tue Jul 14 09:23:15 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.cauldron.sigil.model.eclipse;
+package org.apache.felix.sigil.model.eclipse;
import java.util.Set;
-import org.cauldron.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelElement;
import org.eclipse.core.runtime.IPath;
public interface IDownloadJar extends IModelElement {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java Tue Jul 14 09:23:15 2009
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.cauldron.sigil.model.eclipse;
+package org.apache.felix.sigil.model.eclipse;
import java.util.Collection;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
import org.osgi.framework.Version;
public interface ILibrary extends IModelElement {
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java Tue Jul 14 09:23:15 2009
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.sigil.model.eclipse;
+package org.apache.felix.sigil.model.eclipse;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.common.VersionRange;
public interface ILibraryImport extends IModelElement {
String getLibraryName();
Modified: felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java?rev=793825&r1=793581&r2=793825&view=diff
==============================================================================
--- felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java (original)
+++ felix/trunk/sigil/org.cauldron.bld.core/src/org/apache/felix/sigil/model/eclipse/INewtonSystem.java Tue Jul 14 09:23:15 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.model.eclipse;
+package org.apache.felix.sigil.model.eclipse;
-import org.cauldron.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelElement;
import org.eclipse.core.runtime.IPath;
/**