tidy up cauldron.org references
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@801929 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java b/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
index 450b93d..2e9ef95 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
@@ -78,11 +78,10 @@
public static void init() throws Exception
{
- String uri = "http://sigil.codecauldron.org/xml/sigil-namespace";
- ModelElementFactory.getInstance().register( ISigilBundle.class, SigilBundle.class, "bundle", "sigil", uri );
- ModelElementFactory.getInstance().register( ILibrary.class, Library.class, "library", "sigil", uri );
+ ModelElementFactory.getInstance().register( ISigilBundle.class, SigilBundle.class, "bundle", "sigil", null );
+ ModelElementFactory.getInstance().register( ILibrary.class, Library.class, "library", "sigil", null );
ModelElementFactory.getInstance().register( ILibraryImport.class, LibraryImport.class, "library-import",
- "sigil", uri );
+ "sigil", null );
// osgi elements
ModelElementFactory.getInstance().register( IBundleModelElement.class, BundleModelElement.class, "bundle",
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
index 99178f2..d39bc8b 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
@@ -85,26 +85,30 @@
progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " binary" );
sync( location, bundle.getUpdateLocation(), progress.newChild( 45 ) );
- try
- {
- progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " source" );
- sync( sourcePathLocation, bundle.getSourceLocation(), progress.newChild( 45 ) );
+ if ( bundle.getSourceLocation() != null ) {
+ try
+ {
+ progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " source" );
+ sync( sourcePathLocation, bundle.getSourceLocation(), progress.newChild( 45 ) );
+ }
+ catch ( IOException e )
+ {
+ BldCore.error( "Failed to download source for " + bundle.getSymbolicName() + " " + bundle.getVersion(), e
+ .getCause() );
+ }
}
- catch ( IOException e )
- {
- BldCore.error( "Failed to download source for " + bundle.getSymbolicName() + " " + bundle.getVersion(), e
- .getCause() );
- }
-
- try
- {
- progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " licence" );
- sync( licencePathLocation, bundle.getLicenseURI(), progress.newChild( 10 ) );
- }
- catch ( IOException e )
- {
- BldCore.error( "Failed to download licence for " + bundle.getSymbolicName() + " " + bundle.getVersion(), e
- .getCause() );
+
+ if ( bundle.getLicenseURI() != null ) {
+ try
+ {
+ progress.subTask( "Synchronizing " + bundle.getSymbolicName() + " licence" );
+ sync( licencePathLocation, bundle.getLicenseURI(), progress.newChild( 10 ) );
+ }
+ catch ( IOException e )
+ {
+ BldCore.error( "Failed to download licence for " + bundle.getSymbolicName() + " " + bundle.getVersion(), e
+ .getCause() );
+ }
}
}
@@ -119,9 +123,9 @@
{
try
{
- if ( local != null && !local.toFile().exists() )
+ if ( remote != null )
{
- if ( remote != null )
+ if ( local != null && !local.toFile().exists() )
{
URL url = remote.toURL();
URLConnection connection = url.openConnection();
diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
index 5b31977..108c111 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
@@ -465,9 +465,7 @@
{
// trick to get eclipse to lazy load BldCore for model elements
BldCore.getLicenseManager();
- String uri = "http://sigil.codecauldron.org/xml/sigil-namespace";
- ModelElementFactory.getInstance().register( ISigilProjectModel.class, SigilProject.class, "project", "sigil",
- uri );
+ ModelElementFactory.getInstance().register( ISigilProjectModel.class, SigilProject.class, "project", "sigil", null );
}
diff --git a/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java b/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
index f0c5d9e..f19f81e 100644
--- a/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
+++ b/sigil/eclipse/search/src/org/apache/felix/sigil/search/SigilSearch.java
@@ -60,7 +60,7 @@
{
// The plug-in ID
- public static final String PLUGIN_ID = "org.cauldron.sigil.search";
+ public static final String PLUGIN_ID = "org.apache.felix.sigil.eclipse.search";
private static final String CLASS_EXTENSION = ".class";