add http authentication (FELIX-1372);
fix inheriting of sigil.properties (FELIX-1609).
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@816296 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
index a79a00f..058a97d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
@@ -19,7 +19,7 @@
package org.apache.felix.sigil.config;
-
+import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -32,10 +32,8 @@
import org.apache.felix.sigil.core.util.QuoteUtil;
-
public class BldConfig
{
-
// control properties
public static final String C_BUNDLES = "-bundles";
public static final String C_REPOSITORIES = "-repositories";
@@ -47,15 +45,14 @@
public static final String S_ID = "id";
public static final String S_SYM_NAME = "name";
public static final String S_VERSION = "version";
- public static final String[] STRING_KEYS =
- { S_ACTIVATOR, S_DEFAULTS, S_ID, S_SYM_NAME, S_VERSION, S_SINGLETON };
+ public static final String[] STRING_KEYS = { S_ACTIVATOR, S_DEFAULTS, S_ID,
+ S_SYM_NAME, S_VERSION, S_SINGLETON };
// list properties
public static final String L_CONTENTS = "-contents";
public static final String L_SRC_CONTENTS = "-sourcedirs";
public static final String L_RESOURCES = "-resources";
- public static final String[] LIST_KEYS =
- { L_CONTENTS, L_SRC_CONTENTS, L_RESOURCES };
+ public static final String[] LIST_KEYS = { L_CONTENTS, L_SRC_CONTENTS, L_RESOURCES };
// map properties
public static final String M_EXPORTS = "-exports";
@@ -63,16 +60,16 @@
public static final String M_REQUIRES = "-requires";
public static final String M_FRAGMENT = "-fragment";
public static final String M_LIBS = "-libs";
- public static final String[] MAP_KEYS =
- { M_EXPORTS, M_IMPORTS, M_REQUIRES, M_FRAGMENT, M_LIBS };
+ public static final String[] MAP_KEYS = { M_EXPORTS, M_IMPORTS, M_REQUIRES,
+ M_FRAGMENT, M_LIBS };
// property properties
public static final String P_HEADER = "header";
public static final String P_OPTION = "option";
public static final String P_PACKAGE_VERSION = "package";
public static final String P_BUNDLE_VERSION = "bundle";
- public static final String[] PROP_KEYS =
- { P_HEADER, P_OPTION, P_PACKAGE_VERSION, P_BUNDLE_VERSION };
+ public static final String[] PROP_KEYS = { P_HEADER, P_OPTION, P_PACKAGE_VERSION,
+ P_BUNDLE_VERSION };
// private constants
private static final String LIST_REGEX = ",\\s*";
@@ -93,473 +90,480 @@
private Properties unknown = new Properties();
private String comment = "";
-
public BldConfig()
{
}
-
- public BldConfig( Properties p ) throws IOException
+ public BldConfig(Properties p, File basedir) throws IOException
{
- merge( p );
+ merge(p, basedir);
}
-
- public void setDefault( BldConfig dflt )
+ public void setDefault(BldConfig dflt)
{
this.dflt = dflt;
}
-
- public void setComment( String comment )
+ public void setComment(String comment)
{
this.comment = comment;
}
-
public Properties getUnknown()
{
return unknown;
}
-
- public String getString( String id, String key )
+ public String getString(String id, String key)
{
- if ( id != null && config.containsKey( id ) )
+ if (id != null && config.containsKey(id))
{
- String value = config.get( id ).getString( null, key );
- if ( value != null )
+ String value = config.get(id).getString(null, key);
+ if (value != null)
return value;
}
- return string.containsKey( key ) ? string.get( key ) : ( dflt != null ? dflt.getString( id, key ) : null );
+ return string.containsKey(key) ? string.get(key)
+ : (dflt != null ? dflt.getString(id, key) : null);
}
-
- public List<String> getList( String id, String key )
+ public List<String> getList(String id, String key)
{
- if ( id != null && config.containsKey( id ) )
+ if (id != null && config.containsKey(id))
{
- List<String> value = config.get( id ).getList( null, key );
- if ( value != null )
+ List<String> value = config.get(id).getList(null, key);
+ if (value != null)
return value;
}
- return list.containsKey( key ) ? list.get( key ) : ( dflt != null ? dflt.getList( id, key ) : Collections
- .<String> emptyList() );
+ return list.containsKey(key) ? list.get(key) : (dflt != null ? dflt.getList(id,
+ key) : Collections.<String> emptyList());
}
-
- public Map<String, Map<String, String>> getMap( String id, String key )
+ public Map<String, Map<String, String>> getMap(String id, String key)
{
- if ( id != null && config.containsKey( id ) )
+ if (id != null && config.containsKey(id))
{
- Map<String, Map<String, String>> value = config.get( id ).getMap( null, key );
- if ( value != null )
+ Map<String, Map<String, String>> value = config.get(id).getMap(null, key);
+ if (value != null)
return value;
}
- return map.containsKey( key ) ? map.get( key ) : ( dflt != null ? dflt.getMap( id, key ) : Collections
- .<String, Map<String, String>> emptyMap() );
+ return map.containsKey(key) ? map.get(key) : (dflt != null ? dflt.getMap(id, key)
+ : Collections.<String, Map<String, String>> emptyMap());
}
-
- public void setString( String id, String key, String value )
+ public void setString(String id, String key, String value)
{
- if ( !value.equals( getString( id, key ) ) )
+ if (!value.equals(getString(id, key)))
{
- if ( id != null )
+ if (id != null)
{
- if ( !config.containsKey( id ) )
- config.put( id, new BldConfig() );
- config.get( id ).setString( null, key, value );
+ if (!config.containsKey(id))
+ config.put(id, new BldConfig());
+ config.get(id).setString(null, key, value);
}
else
{
- String dval = ( dflt == null ? dflt.getString( null, key ) : null );
- if ( value.equals( "" ) && ( dval == null || dval.equals( "" ) ) )
+ String dval = (dflt == null ? dflt.getString(null, key) : null);
+ if (value.equals("") && (dval == null || dval.equals("")))
{
- string.remove( key );
+ string.remove(key);
}
else
{
- string.put( key, value );
+ string.put(key, value);
}
}
}
}
-
- public void setList( String id, String key, List<String> value )
+ public void setList(String id, String key, List<String> value)
{
- if ( !value.equals( getList( id, key ) ) )
+ if (!value.equals(getList(id, key)))
{
- if ( id != null )
+ if (id != null)
{
- if ( !config.containsKey( id ) )
- config.put( id, new BldConfig() );
- config.get( id ).setList( null, key, value );
+ if (!config.containsKey(id))
+ config.put(id, new BldConfig());
+ config.get(id).setList(null, key, value);
}
- else if ( value.isEmpty() && ( dflt == null || dflt.getList( null, key ).isEmpty() ) )
+ else if (value.isEmpty()
+ && (dflt == null || dflt.getList(null, key).isEmpty()))
{
- list.remove( key );
+ list.remove(key);
}
else
{
- list.put( key, value );
+ list.put(key, value);
}
}
}
-
- public void setMap( String id, String key, Map<String, Map<String, String>> value )
+ public void setMap(String id, String key, Map<String, Map<String, String>> value)
{
- if ( !value.equals( getMap( id, key ) ) )
+ if (!value.equals(getMap(id, key)))
{
- if ( id != null )
+ if (id != null)
{
- if ( !config.containsKey( id ) )
- config.put( id, new BldConfig() );
- config.get( id ).setMap( null, key, value );
+ if (!config.containsKey(id))
+ config.put(id, new BldConfig());
+ config.get(id).setMap(null, key, value);
}
- else if ( value.isEmpty() && ( dflt == null || dflt.getMap( null, key ).isEmpty() ) )
+ else if (value.isEmpty()
+ && (dflt == null || dflt.getMap(null, key).isEmpty()))
{
- map.remove( key );
+ map.remove(key);
}
else
{
- map.put( key, value );
+ map.put(key, value);
}
}
}
-
- public Properties getProps( String id, String key )
+ public Properties getProps(String id, String key)
{
// merge main and sub properties
Properties props = new Properties();
- if ( dflt != null )
- props.putAll( dflt.getProps( id, key ) );
+ if (dflt != null)
+ props.putAll(dflt.getProps(id, key));
- if ( property.containsKey( key ) )
- props.putAll( property.get( key ) );
+ if (property.containsKey(key))
+ props.putAll(property.get(key));
- if ( id != null && config.containsKey( id ) )
+ if (id != null && config.containsKey(id))
{
- Properties p2 = config.get( id ).getProps( null, key );
- if ( p2 != null )
- props.putAll( p2 );
+ Properties p2 = config.get(id).getProps(null, key);
+ if (p2 != null)
+ props.putAll(p2);
}
return props;
}
-
// only sets one property at a time
- public void setProp( String id, String key, String k2, String v2 )
+ public void setProp(String id, String key, String k2, String v2)
{
- if ( v2 == null )
+ if (v2 == null)
return;
- Properties props = getProps( id, key );
- if ( !v2.equals( props.getProperty( key ) ) )
+ Properties props = getProps(id, key);
+ if (!v2.equals(props.getProperty(key)))
{
- if ( id != null )
+ if (id != null)
{
- if ( !config.containsKey( id ) )
- config.put( id, new BldConfig() );
- config.get( id ).setProp( null, key, k2, v2 );
+ if (!config.containsKey(id))
+ config.put(id, new BldConfig());
+ config.get(id).setProp(null, key, k2, v2);
}
else
{
- if ( property.containsKey( key ) )
+ if (property.containsKey(key))
{
- property.get( key ).put( k2, v2 );
+ property.get(key).put(k2, v2);
}
else
{
Properties value = new Properties();
- value.put( k2, v2 );
- property.put( key, value );
+ value.put(k2, v2);
+ property.put(key, value);
}
}
}
}
-
/**
* write config in Property file format.
* This allows us to make it prettier than Properties.store().
*/
- public void write( final PrintWriter out )
+ public void write(final PrintWriter out)
{
- out.println( comment );
+ out.println(comment);
// Note: don't add date stamp, or file will differ each time it's saved.
- out.println( "# sigil project file, saved by plugin.\n" );
+ out.println("# sigil project file, saved by plugin.\n");
- dump( "", new Properties()
+ dump("", new Properties()
{
private static final long serialVersionUID = 1L; //appease eclipse
-
@Override
- public Object put( Object key, Object value )
+ public Object put(Object key, Object value)
{
- if ( value instanceof String )
+ if (value instanceof String)
{
- out.println( key + ": " + value );
- out.println( "" );
+ out.println(key + ": " + value);
+ out.println("");
}
- else if ( value instanceof List )
+ else if (value instanceof List)
{
- out.println( key + ": \\" );
- for ( Object k : ( List<?> ) value )
+ out.println(key + ": \\");
+ for (Object k : (List<?>) value)
{
- out.println( "\t" + k + ", \\" );
+ out.println("\t" + k + ", \\");
}
- out.println( "" );
+ out.println("");
}
- else if ( value instanceof Map )
+ else if (value instanceof Map)
{
- out.println( key + ": \\" );
+ out.println(key + ": \\");
StringBuilder b = new StringBuilder();
- for ( Map.Entry<?, ?> e : ( ( Map<?, ?> ) value ).entrySet() )
+ for (Map.Entry<?, ?> e : ((Map<?, ?>) value).entrySet())
{
- b.append( "\t" );
- b.append( e.getKey() );
- Map<?, ?> v = ( Map<?, ?> ) e.getValue();
- if ( !v.isEmpty() )
+ b.append("\t");
+ b.append(e.getKey());
+ Map<?, ?> v = (Map<?, ?>) e.getValue();
+ if (!v.isEmpty())
{
- for ( Map.Entry<?, ?> e2 : v.entrySet() )
+ for (Map.Entry<?, ?> e2 : v.entrySet())
{
- b.append( MAPATTR_SEP );
- b.append( e2.getKey() );
- b.append( "=" );
+ b.append(MAPATTR_SEP);
+ b.append(e2.getKey());
+ b.append("=");
String v2 = e2.getValue().toString();
- if ( v2.contains( "," ) )
+ if (v2.contains(","))
{
- b.append( "\"" );
- b.append( v2 );
- b.append( "\"" );
+ b.append("\"");
+ b.append(v2);
+ b.append("\"");
}
else
{
- b.append( v2 );
+ b.append(v2);
}
}
}
- b.append( ", \\\n" );
+ b.append(", \\\n");
}
- out.println( b.toString() );
+ out.println(b.toString());
}
return null;
}
- } );
- out.println( "# end" );
+ });
+ out.println("# end");
}
-
/**
* dump config in pseudo Properties format.
* Note: some values are not Strings (they're List<String>).
*/
- private void dump( String prefix, Properties p )
+ private void dump(String prefix, Properties p)
{
- for ( String key : string.keySet() )
+ for (String key : string.keySet())
{
- p.put( prefix + key, string.get( key ) );
+ p.put(prefix + key, string.get(key));
}
- for ( String key : list.keySet() )
+ for (String key : list.keySet())
{
- List<String> list2 = list.get( key );
- p.put( prefix + key, list2 );
+ List<String> list2 = list.get(key);
+ p.put(prefix + key, list2);
}
- for ( String key : map.keySet() )
+ for (String key : map.keySet())
{
- Map<String, Map<String, String>> map2 = map.get( key );
- p.put( prefix + key, map2 );
+ Map<String, Map<String, String>> map2 = map.get(key);
+ p.put(prefix + key, map2);
}
- for ( String key : property.keySet() )
+ for (String key : property.keySet())
{
- Properties props = property.get( key );
- for ( Object k2 : props.keySet() )
+ Properties props = property.get(key);
+ for (Object k2 : props.keySet())
{
- p.put( prefix + key + SUBKEY_SEP + k2, props.get( k2 ) );
+ p.put(prefix + key + SUBKEY_SEP + k2, props.get(k2));
}
}
- for ( String key : config.keySet() )
+ for (String key : config.keySet())
{
- BldConfig config2 = config.get( key );
- config2.dump( key + SUBKEY_SEP + prefix, p );
+ BldConfig config2 = config.get(key);
+ config2.dump(key + SUBKEY_SEP + prefix, p);
}
- for ( Object key : unknown.keySet() )
+ for (Object key : unknown.keySet())
{
- String value = unknown.getProperty( ( String ) key );
- if ( value.length() > 0 )
- p.put( prefix + key, value );
+ String value = unknown.getProperty((String) key);
+ if (value.length() > 0)
+ p.put(prefix + key, value);
}
}
-
/**
* merges properties into current configuration.
* @param p
* @throws IOException
*/
- public void merge( Properties p ) throws IOException
+ public void merge(Properties p, File basedir) throws IOException
{
- if ( p.isEmpty() )
+ if (p.isEmpty())
return;
- final List<String> strings = Arrays.asList( STRING_KEYS );
- final List<String> lists = Arrays.asList( LIST_KEYS );
- final List<String> maps = Arrays.asList( MAP_KEYS );
+ final List<String> strings = Arrays.asList(STRING_KEYS);
+ final List<String> lists = Arrays.asList(LIST_KEYS);
+ final List<String> maps = Arrays.asList(MAP_KEYS);
List<String> bundleKeys = new ArrayList<String>();
List<String> repoKeys = new ArrayList<String>();
- String bundles = p.getProperty( C_BUNDLES );
- if ( bundles != null )
+ String bundles = p.getProperty(C_BUNDLES);
+ if (bundles != null)
{
- bundleKeys.addAll( Arrays.asList( bundles.split( LIST_REGEX ) ) );
- list.put( C_BUNDLES, bundleKeys );
+ bundleKeys.addAll(Arrays.asList(bundles.split(LIST_REGEX)));
+ list.put(C_BUNDLES, bundleKeys);
}
- String repos = p.getProperty( C_REPOSITORIES );
- if ( repos != null )
+ String repos = p.getProperty(C_REPOSITORIES);
+ if (repos != null && !list.containsKey(C_REPOSITORIES))
{
- for ( String s : repos.split( LIST_REGEX ) )
+ for (String s : repos.split(LIST_REGEX))
{
- repoKeys.add( s.trim() );
+ repoKeys.add(s.trim());
}
- list.put( C_REPOSITORIES, repoKeys );
+ list.put(C_REPOSITORIES, repoKeys);
}
List<String> subKeys = new ArrayList<String>();
- subKeys.addAll( Arrays.asList( PROP_KEYS ) );
- subKeys.addAll( bundleKeys );
- subKeys.addAll( repoKeys );
+ subKeys.addAll(Arrays.asList(PROP_KEYS));
+ subKeys.addAll(bundleKeys);
+ subKeys.addAll(repoKeys);
Map<String, Properties> sub = new TreeMap<String, Properties>();
- for ( Object k : p.keySet() )
+ for (Object k : p.keySet())
{
- String key = ( String ) k;
- if ( key.equals( C_BUNDLES ) || key.equals( C_REPOSITORIES ) )
+ String key = (String) k;
+ if (key.equals(C_BUNDLES) || key.equals(C_REPOSITORIES))
continue;
- String value = p.getProperty( key );
- String[] keys = key.split( SUBKEY_SEP, 2 );
+ String[] keys = key.split(SUBKEY_SEP, 2);
+ String value = p.getProperty(key);
- if ( keys.length > 1 )
+ // expand ${.} and ${..} relative to file
+ if (value.contains("${.}"))
+ value = value.replace("${.}", basedir.getPath());
+ else if (value.contains("${..}"))
+ value = value.replace("${..}", basedir.getParent());
+
+ if (keys.length > 1)
{
- Properties p2 = sub.get( keys[0] );
- if ( p2 == null )
+ Properties p2 = sub.get(keys[0]);
+ if (p2 == null)
{
p2 = new Properties();
- sub.put( keys[0], p2 );
- if ( !subKeys.contains( keys[0] ) )
+ sub.put(keys[0], p2);
+ if (!subKeys.contains(keys[0]))
{
- unknown.setProperty( keys[0] + SUBKEY_SEP, "" );
+ // unknown.setProperty(keys[0] + SUBKEY_SEP, "");
}
}
- p2.setProperty( keys[1], value );
+ p2.setProperty(keys[1], value);
}
- else if ( strings.contains( key ) )
+ else if (strings.contains(key))
{
- if ( !string.containsKey( key ) )
- string.put( key, value );
+ if (!string.containsKey(key))
+ string.put(key, value);
}
- else if ( lists.contains( key ) )
+ else if (lists.contains(key))
{
- if ( !list.containsKey( key ) )
+ if (!list.containsKey(key))
{
ArrayList<String> list2 = new ArrayList<String>();
- for ( String s : value.split( LIST_REGEX ) )
+ for (String s : value.split(LIST_REGEX))
{
- if ( s.trim().length() > 0 )
+ if (s.trim().length() > 0)
{
- list2.add( s.trim() );
+ list2.add(s.trim());
}
}
- if ( !list2.isEmpty() )
+ if (!list2.isEmpty())
{
- list.put( key, list2 );
+ list.put(key, list2);
}
}
}
- else if ( maps.contains( key ) )
+ else if (maps.contains(key))
{
- if ( !map.containsKey( key ) )
+ if (!map.containsKey(key))
{
Map<String, Map<String, String>> map2 = new TreeMap<String, Map<String, String>>();
- for ( String subValue : QuoteUtil.split( value ) )
+ for (String subValue : QuoteUtil.split(value))
{
- if ( subValue.trim().length() > 0 )
+ if (subValue.trim().length() > 0)
{
- String[] split = subValue.split( MAPATTR_REGEX );
+ String[] split = subValue.split(MAPATTR_REGEX);
Map<String, String> map3 = new TreeMap<String, String>();
- for ( int i = 1; i < split.length; ++i )
+ for (int i = 1; i < split.length; ++i)
{
- String[] keyVal = split[i].split( ":?=", 2 );
- if ( keyVal.length != 2 )
+ String[] keyVal = split[i].split(":?=", 2);
+ if (keyVal.length != 2)
{
- throw new IOException( "attribute missing '=':" + subValue );
+ throw new IOException("attribute missing '=':"
+ + subValue);
}
- map3.put( keyVal[0], keyVal[1] );
+ map3.put(keyVal[0], keyVal[1]);
}
- map2.put( split[0], map3 );
+ map2.put(split[0], map3);
}
}
- map.put( key, map2 );
+ map.put(key, map2);
}
}
else
{
- unknown.setProperty( key, value );
+ unknown.setProperty(key, value);
}
}
- for ( String subKey : sub.keySet() )
+ for (String subKey : sub.keySet())
{
- Properties props = sub.get( subKey );
- if ( !props.isEmpty() )
+ Properties props = sub.get(subKey);
+ if (!props.isEmpty())
{
- if ( bundleKeys.contains( subKey ) )
+ if (bundleKeys.contains(subKey))
{
- BldConfig config2 = new BldConfig( props );
+ BldConfig config2 = new BldConfig(props, basedir);
Properties unkProps = config2.getUnknown();
- if ( config2.map.containsKey( M_IMPORTS ) )
- unkProps.setProperty( M_IMPORTS, "" );
+ if (config2.map.containsKey(M_IMPORTS))
+ unkProps.setProperty(M_IMPORTS, "");
- if ( config2.map.containsKey( M_REQUIRES ) )
- unkProps.setProperty( M_REQUIRES, "" );
+ if (config2.map.containsKey(M_REQUIRES))
+ unkProps.setProperty(M_REQUIRES, "");
- for ( Object unk : unkProps.keySet() )
+ for (Object unk : unkProps.keySet())
{
- unknown.setProperty( subKey + SUBKEY_SEP + unk, "" );
+ unknown.setProperty(subKey + SUBKEY_SEP + unk, "");
}
- config.put( subKey, config2 );
+ config.put(subKey, config2);
}
else
{
- property.put( subKey, props );
+ Properties p2 = property.get(subKey);
+ if (p2 == null)
+ {
+ property.put(subKey, props);
+ }
+ else
+ {
+ for (Object k : props.keySet())
+ {
+ if (!p2.containsKey(k))
+ {
+ p2.put(k, props.get(k));
+ }
+ }
+ }
}
}
}
}
-
@Override
public String toString()
{
- return "string: " + string + " list:" + list + " map: " + map + " prop: " + property + " config:" + config;
+ return "STRING: " + string + " LIST:" + list + " MAP: " + map + " PROPERTY: "
+ + property + " CONFIG:" + config + "\nDFLT{ " + dflt + "}";
}
}
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java b/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
index e2f3556..df78233 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.config;
-
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.File;
@@ -56,7 +55,6 @@
import org.apache.felix.sigil.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
-
public class BldProject implements IBldProject, IRepositoryConfig
{
private static final String OVERRIDE_PREFIX = "sigil.";
@@ -75,153 +73,156 @@
private TreeSet<String> packageWildDefaults;
private long lastModified;
-
- /* package */BldProject( URI relLoc )
+ /* package */BldProject(URI relLoc)
{
config = new BldConfig();
- convert = new BldConverter( config );
- loc = new File( "." ).toURI().resolve( relLoc ).normalize();
- File f = new File( loc );
+ convert = new BldConverter(config);
+ loc = new File(".").toURI().resolve(relLoc).normalize();
+ File f = new File(loc);
lastModified = f.lastModified();
baseDir = f.getParentFile();
}
-
/* package */void load() throws IOException
{
// allow System property overrides, e.g.
// ANT_OPTS='-Dsigil.option\;addMissingImports=false' ant
- config.merge( getOverrides() );
+ config.merge(getOverrides(), null);
InputStream in = null;
try
{
in = loc.toURL().openStream();
- BufferedInputStream bis = new BufferedInputStream( in );
- bis.mark( MAX_HEADER );
- readHeader( bis );
+ BufferedInputStream bis = new BufferedInputStream(in);
+ bis.mark(MAX_HEADER);
+ readHeader(bis);
bis.reset();
Properties p = new Properties();
- p.load( bis );
- config.merge( p );
+ p.load(bis);
+ config.merge(p, baseDir);
Properties unknown = config.getUnknown();
- if ( !unknown.isEmpty() )
- System.err.println( "WARN: unknown keys " + unknown.keySet() + " in " + loc );
+ if (!unknown.isEmpty())
+ System.err.println("WARN: unknown keys " + unknown.keySet() + " in "
+ + loc);
- loadDefaults( p );
+ loadDefaults(p);
requirements = parseRequirements();
}
finally
{
- if ( in != null )
+ if (in != null)
{
in.close();
}
}
+
+ //System.err.println("XXX loc=" + loc + ", BldConfig: " + config);
}
-
- /* package */void loadDefaults( Properties p ) throws IOException
+ /* package */void loadDefaults(Properties p) throws IOException
{
- BldConfig c = loadDefaults( p, baseDir, null );
- config.setDefault( c );
+ BldConfig c = loadDefaults(p, baseDir, null);
+ config.setDefault(c);
- Properties options = config.getProps( null, BldConfig.P_OPTION );
+ Properties options = config.getProps(null, BldConfig.P_OPTION);
- if ( !options.containsKey( BldAttr.OPTION_ADD_IMPORTS ) )
- c.setProp( null, BldConfig.P_OPTION, BldAttr.OPTION_ADD_IMPORTS, "true" );
+ if (!options.containsKey(BldAttr.OPTION_ADD_IMPORTS))
+ c.setProp(null, BldConfig.P_OPTION, BldAttr.OPTION_ADD_IMPORTS, "true");
// default omitUnusedImports option depends on number of bundles...
// we set it here to avoid it being written by save(),
// but as this may alter cached defaults, once set we have to reset it
// for each project.
- boolean omitSet = options.containsKey( "__omit_set__" );
+ boolean omitSet = options.containsKey("__omit_set__");
boolean multiple = getBundleIds().size() > 1;
- if ( multiple || omitSet )
+ if (multiple || omitSet)
{
- if ( !options.containsKey( BldAttr.OPTION_OMIT_IMPORTS ) || omitSet )
+ if (!options.containsKey(BldAttr.OPTION_OMIT_IMPORTS) || omitSet)
{
- c.setProp( null, BldConfig.P_OPTION, BldAttr.OPTION_OMIT_IMPORTS, multiple + "" );
- c.setProp( null, BldConfig.P_OPTION, "__omit_set__", "true" );
+ c.setProp(null, BldConfig.P_OPTION, BldAttr.OPTION_OMIT_IMPORTS, multiple
+ + "");
+ c.setProp(null, BldConfig.P_OPTION, "__omit_set__", "true");
}
}
}
-
- private synchronized BldConfig loadDefaults( Properties props, File base, BldConfig dflt ) throws IOException
+ private synchronized BldConfig loadDefaults(Properties props, File base,
+ BldConfig dflt) throws IOException
{
boolean cached = false;
- String defaults = props.getProperty( BldConfig.S_DEFAULTS, "-" + IBldProject.PROJECT_DEFAULTS );
+ String defaults = props.getProperty(BldConfig.S_DEFAULTS, "-"
+ + IBldProject.PROJECT_DEFAULTS);
- if ( base != null && defaults.length() > 0 )
+ if (base != null && defaults.length() > 0)
{
- boolean ignore = defaults.startsWith( "-" );
+ boolean ignore = defaults.startsWith("-");
- if ( ignore )
- defaults = defaults.substring( 1 );
+ if (ignore)
+ defaults = defaults.substring(1);
try
{
- File file = new File( base, defaults ).getCanonicalFile();
+ File file = new File(base, defaults).getCanonicalFile();
URL url = file.toURL();
- if ( dflt == null )
+ if (dflt == null)
{
- dflt = defaultsCache.get( url );
- if ( dflt != null )
+ dflt = defaultsCache.get(url);
+ if (dflt != null)
return dflt;
dflt = new BldConfig();
- defaultsCache.put( url, dflt );
+ defaultsCache.put(url, dflt);
cached = true;
}
Properties p = new Properties();
// FIXME stream not closed
- p.load( url.openStream() );
- dflt.merge( p );
+ p.load(url.openStream());
+ dflt.merge(p, file.getParentFile());
ignore = false;
- loadDefaults( p, file.getParentFile(), dflt );
+ loadDefaults(p, file.getParentFile(), dflt);
}
- catch ( IOException e )
+ catch (IOException e)
{
- if ( !ignore )
+ if (!ignore)
throw e;
}
}
- if ( dflt == null )
+ if (dflt == null)
return new BldConfig();
- if ( cached )
+ if (cached)
{
Properties unknown = dflt.getUnknown();
- if ( !unknown.isEmpty() )
- System.err.println( "WARN: unknown keys " + unknown.keySet() + " in defaults for " + loc );
+ if (!unknown.isEmpty())
+ System.err.println("WARN: unknown keys " + unknown.keySet()
+ + " in defaults for " + loc);
}
return dflt;
}
-
private static Properties getOverrides()
{
- if ( overrides == null )
+ if (overrides == null)
{
overrides = new Properties();
Properties sysProps = System.getProperties();
- for ( Object okey : sysProps.keySet() )
+ for (Object okey : sysProps.keySet())
{
- String key = ( String ) okey;
- if ( key.startsWith( OVERRIDE_PREFIX ) )
+ String key = (String) okey;
+ if (key.startsWith(OVERRIDE_PREFIX))
{
- overrides.setProperty( key.substring( OVERRIDE_PREFIX.length() ), sysProps.getProperty( key ) );
+ overrides.setProperty(key.substring(OVERRIDE_PREFIX.length()),
+ sysProps.getProperty(key));
}
}
}
@@ -229,81 +230,75 @@
return overrides;
}
-
- private void readHeader( InputStream in ) throws IOException
+ private void readHeader(InputStream in) throws IOException
{
- BufferedReader r = new BufferedReader( new InputStreamReader( in ) );
+ BufferedReader r = new BufferedReader(new InputStreamReader(in));
StringBuffer header = new StringBuffer();
String line;
- while ( ( line = r.readLine() ) != null )
+ while ((line = r.readLine()) != null)
{
- if ( line.startsWith( "#" ) )
+ if (line.startsWith("#"))
{
- header.append( line );
- header.append( "\n" );
+ header.append(line);
+ header.append("\n");
}
else
{
- config.setComment( header.toString() );
+ config.setComment(header.toString());
break;
}
}
}
-
- public File resolve( String path )
+ public File resolve(String path)
{
- File file = new File( path );
- if ( !file.isAbsolute() )
+ File file = new File(path);
+ if (!file.isAbsolute())
{
// can't use loc.resolve(value), as value may not be valid URI.
- file = new File( baseDir, path );
+ file = new File(baseDir, path);
}
return file;
}
-
public String getVersion()
{
- String version = config.getString( null, BldConfig.S_VERSION );
+ String version = config.getString(null, BldConfig.S_VERSION);
return version == null ? "0" : version;
}
-
public IBundleModelElement getDependencies()
{
IBundleModelElement dependencies = new BundleModelElement();
- for ( IModelElement element : getRequirements().children() )
+ for (IModelElement element : getRequirements().children())
{
- if ( element instanceof IPackageImport )
+ if (element instanceof IPackageImport)
{
- IPackageImport import1 = ( IPackageImport ) element;
- if ( !import1.isDependency() )
+ IPackageImport import1 = (IPackageImport) element;
+ if (!import1.isDependency())
continue;
- IPackageImport pi = ( IPackageImport ) ( element.clone() );
- pi.setParent( null );
- dependencies.addImport( pi );
+ IPackageImport pi = (IPackageImport) (element.clone());
+ pi.setParent(null);
+ dependencies.addImport(pi);
}
else
{
- IRequiredBundle rb = ( IRequiredBundle ) ( element.clone() );
- rb.setParent( null );
- dependencies.addRequiredBundle( rb );
+ IRequiredBundle rb = (IRequiredBundle) (element.clone());
+ rb.setParent(null);
+ dependencies.addRequiredBundle(rb);
}
}
return dependencies;
}
-
private IBundleModelElement getRequirements()
{
return requirements;
}
-
/*
* private boolean globMatch(String pkg, Set<String> set) { // exact match
* if (set.contains(pkg)) return true;
@@ -322,56 +317,56 @@
* auto runtime ignore
*
*/
- private void setResolve( IPackageImport pi, String resolve ) throws IOException
+ private void setResolve(IPackageImport pi, String resolve) throws IOException
{
- if ( pi.isOptional() )
- pi.setDependency( false );
+ if (pi.isOptional())
+ pi.setDependency(false);
- if ( BldAttr.RESOLVE_COMPILE.equals( resolve ) )
+ if (BldAttr.RESOLVE_COMPILE.equals(resolve))
{
- if ( pi.isOptional() )
- pi.setDependency( true );
+ if (pi.isOptional())
+ pi.setDependency(true);
else
- pi.setOSGiImport( OSGiImport.NEVER );
+ pi.setOSGiImport(OSGiImport.NEVER);
}
- else if ( BldAttr.RESOLVE_RUNTIME.equals( resolve ) )
+ else if (BldAttr.RESOLVE_RUNTIME.equals(resolve))
{
- pi.setDependency( false );
- pi.setOSGiImport( OSGiImport.ALWAYS );
+ pi.setDependency(false);
+ pi.setOSGiImport(OSGiImport.ALWAYS);
}
- else if ( BldAttr.RESOLVE_AUTO.equals( resolve ) )
+ else if (BldAttr.RESOLVE_AUTO.equals(resolve))
{
- pi.setDependency( false );
+ pi.setDependency(false);
}
- else if ( BldAttr.RESOLVE_IGNORE.equals( resolve ) )
+ else if (BldAttr.RESOLVE_IGNORE.equals(resolve))
{
- pi.setDependency( false );
- pi.setOSGiImport( OSGiImport.NEVER );
+ pi.setDependency(false);
+ pi.setOSGiImport(OSGiImport.NEVER);
}
- else if ( resolve != null )
+ else if (resolve != null)
{
- throw new IOException( "Bad attribute value: " + BldAttr.RESOLVE_ATTRIBUTE + "=" + resolve );
+ throw new IOException("Bad attribute value: " + BldAttr.RESOLVE_ATTRIBUTE
+ + "=" + resolve);
}
}
-
/**
* get external resolve= attribute from internal PackageImport flags. This
* is called from BldConverter.setBundle().
*/
- public static String getResolve( IPackageImport pi, boolean isDependency )
+ public static String getResolve(IPackageImport pi, boolean isDependency)
{
OSGiImport osgiImport = pi.getOSGiImport();
String resolve = null;
- if ( isDependency )
+ if (isDependency)
{
- if ( osgiImport.equals( OSGiImport.NEVER ) || pi.isOptional() )
+ if (osgiImport.equals(OSGiImport.NEVER) || pi.isOptional())
resolve = BldAttr.RESOLVE_COMPILE;
}
else
{
- switch ( osgiImport )
+ switch (osgiImport)
{
case ALWAYS:
resolve = BldAttr.RESOLVE_RUNTIME;
@@ -387,33 +382,32 @@
return resolve;
}
-
- public String getDefaultPackageVersion( String name )
+ public String getDefaultPackageVersion(String name)
{
- if ( packageDefaults == null )
+ if (packageDefaults == null)
{
- packageDefaults = config.getProps( null, BldConfig.P_PACKAGE_VERSION );
+ packageDefaults = config.getProps(null, BldConfig.P_PACKAGE_VERSION);
packageWildDefaults = new TreeSet<String>();
- for ( Object key : packageDefaults.keySet() )
+ for (Object key : packageDefaults.keySet())
{
- String pkg = ( String ) key;
- if ( pkg.endsWith( "*" ) )
+ String pkg = (String) key;
+ if (pkg.endsWith("*"))
{
- packageWildDefaults.add( pkg.substring( 0, pkg.length() - 1 ) );
+ packageWildDefaults.add(pkg.substring(0, pkg.length() - 1));
}
}
}
- String version = packageDefaults.getProperty( name );
+ String version = packageDefaults.getProperty(name);
- if ( version == null )
+ if (version == null)
{
- for ( String pkg : packageWildDefaults )
+ for (String pkg : packageWildDefaults)
{
- if ( name.startsWith( pkg ) )
+ if (name.startsWith(pkg))
{
- version = packageDefaults.getProperty( pkg + "*" );
+ version = packageDefaults.getProperty(pkg + "*");
// break; -- don't break, as we want the longest match
}
}
@@ -422,7 +416,6 @@
return version;
}
-
private synchronized BundleModelElement parseRequirements() throws IOException
{
BundleModelElement reqs = new BundleModelElement();
@@ -431,75 +424,74 @@
HashSet<String> exports = new HashSet<String>();
parseExports(reqs, exports);
-
+
parseImports(reqs, sourceContents, exports);
-
+
parseRequires(reqs);
-
+
return reqs;
}
-
/**
* @param reqs
* @param exports
*/
- private void parseExports( BundleModelElement reqs, HashSet<String> exports )
+ private void parseExports(BundleModelElement reqs, HashSet<String> exports)
{
- for ( IBldBundle bundle : getBundles() )
+ for (IBldBundle bundle : getBundles())
{
- for ( IPackageExport export : bundle.getExports() )
+ for (IPackageExport export : bundle.getExports())
{
- exports.add( export.getPackageName() );
+ exports.add(export.getPackageName());
}
}
}
-
/**
* @param reqs
* @throws IOException
*/
- private void parseRequires( BundleModelElement reqs ) throws IOException
+ private void parseRequires(BundleModelElement reqs) throws IOException
{
- Map<String, Map<String, String>> requires = config.getMap( null, BldConfig.M_REQUIRES );
- Properties bundleDefaults = config.getProps( null, BldConfig.P_BUNDLE_VERSION );
+ Map<String, Map<String, String>> requires = config.getMap(null,
+ BldConfig.M_REQUIRES);
+ Properties bundleDefaults = config.getProps(null, BldConfig.P_BUNDLE_VERSION);
- if ( requires != null )
+ if (requires != null)
{
- for ( String name : requires.keySet() )
+ for (String name : requires.keySet())
{
- Map<String, String> attr = requires.get( name );
- String versions = attr.containsKey( BldAttr.VERSION_ATTRIBUTE ) ? attr.get( BldAttr.VERSION_ATTRIBUTE )
- : bundleDefaults.getProperty( name );
- String resolution = attr.get( BldAttr.RESOLUTION_ATTRIBUTE );
+ Map<String, String> attr = requires.get(name);
+ String versions = attr.containsKey(BldAttr.VERSION_ATTRIBUTE) ? attr.get(BldAttr.VERSION_ATTRIBUTE)
+ : bundleDefaults.getProperty(name);
+ String resolution = attr.get(BldAttr.RESOLUTION_ATTRIBUTE);
RequiredBundle rb = new RequiredBundle();
- rb.setSymbolicName( name );
- rb.setVersions( VersionRange.parseVersionRange( versions ) );
+ rb.setSymbolicName(name);
+ rb.setVersions(VersionRange.parseVersionRange(versions));
- if ( BldAttr.RESOLUTION_OPTIONAL.equals( resolution ) )
+ if (BldAttr.RESOLUTION_OPTIONAL.equals(resolution))
{
- rb.setOptional( true );
+ rb.setOptional(true);
}
- else if ( resolution != null )
+ else if (resolution != null)
{
- throw new IOException( "Bad attribute value: " + BldAttr.RESOLUTION_ATTRIBUTE + "=" + resolution );
+ throw new IOException("Bad attribute value: "
+ + BldAttr.RESOLUTION_ATTRIBUTE + "=" + resolution);
}
- reqs.addRequiredBundle( rb );
+ reqs.addRequiredBundle(rb);
}
}
- for ( IBldBundle bundle : getBundles() )
+ for (IBldBundle bundle : getBundles())
{
IRequiredBundle fh = bundle.getFragmentHost();
- if ( fh != null )
- reqs.addRequiredBundle( fh );
+ if (fh != null)
+ reqs.addRequiredBundle(fh);
}
}
-
/**
* @param reqs
* @param exports
@@ -507,68 +499,71 @@
* @throws IOException
*
*/
- private void parseImports(BundleModelElement reqs, List<String> sourceContents, HashSet<String> exports) throws IOException
+ private void parseImports(BundleModelElement reqs, List<String> sourceContents,
+ HashSet<String> exports) throws IOException
{
- Map<String, Map<String, String>> imports = config.getMap( null, BldConfig.M_IMPORTS );
+ Map<String, Map<String, String>> imports = config.getMap(null,
+ BldConfig.M_IMPORTS);
- for ( String name : imports.keySet() )
+ for (String name : imports.keySet())
{
- Map<String, String> attr = imports.get( name );
+ Map<String, String> attr = imports.get(name);
- String resolve = attr.get( BldAttr.RESOLVE_ATTRIBUTE );
- String resolution = attr.get( BldAttr.RESOLUTION_ATTRIBUTE );
- String versions = attr.containsKey( BldAttr.VERSION_ATTRIBUTE ) ? attr.get( BldAttr.VERSION_ATTRIBUTE )
- : getDefaultPackageVersion( name );
+ String resolve = attr.get(BldAttr.RESOLVE_ATTRIBUTE);
+ String resolution = attr.get(BldAttr.RESOLUTION_ATTRIBUTE);
+ String versions = attr.containsKey(BldAttr.VERSION_ATTRIBUTE) ? attr.get(BldAttr.VERSION_ATTRIBUTE)
+ : getDefaultPackageVersion(name);
PackageImport pi = new PackageImport();
- pi.setPackageName( name );
+ pi.setPackageName(name);
// avoid dependency on self-exports
// XXX: BldConverter.setBundle contains similar logic
- if ( exports.contains( name ) && ( sourceContents.contains( name ) || sourceContents.isEmpty() ) )
+ if (exports.contains(name)
+ && (sourceContents.contains(name) || sourceContents.isEmpty()))
{
- pi.setDependency( false );
- if ( versions == null )
+ pi.setDependency(false);
+ if (versions == null)
versions = getVersion();
}
- if ( !checkVersionRange( versions ) )
+ if (!checkVersionRange(versions))
{
- throw new IOException( "Failed to parse version range for " + resolve
- + " missing \"'s around version range?" );
+ throw new IOException("Failed to parse version range for " + resolve
+ + " missing \"'s around version range?");
}
- pi.setVersions( VersionRange.parseVersionRange( versions ) );
+ pi.setVersions(VersionRange.parseVersionRange(versions));
- if ( BldAttr.RESOLUTION_OPTIONAL.equals( resolution ) )
+ if (BldAttr.RESOLUTION_OPTIONAL.equals(resolution))
{
- pi.setOptional( true );
+ pi.setOptional(true);
}
- else if ( resolution != null )
+ else if (resolution != null)
{
- throw new IOException( "Bad attribute value: " + BldAttr.RESOLUTION_ATTRIBUTE + "=" + resolution );
+ throw new IOException("Bad attribute value: "
+ + BldAttr.RESOLUTION_ATTRIBUTE + "=" + resolution);
}
- setResolve( pi, resolve );
+ setResolve(pi, resolve);
- reqs.addImport( pi );
+ reqs.addImport(pi);
}
}
-
- private boolean checkVersionRange( String versions )
+ private boolean checkVersionRange(String versions)
{
- if ( versions == null || versions.length() == 0 )
+ if (versions == null || versions.length() == 0)
{
return true;
}
else
{
- switch ( versions.charAt( 0 ) )
+ switch (versions.charAt(0))
{
case '(':
case '[':
- switch ( versions.charAt( versions.length() - 1 ) )
+ switch (versions.charAt(versions.length() - 1))
{
case ')':
case ']':
@@ -582,216 +577,187 @@
}
}
-
public List<String> getBundleIds()
{
- List<String> ids = config.getList( null, BldConfig.C_BUNDLES );
- if ( ids == null )
+ List<String> ids = config.getList(null, BldConfig.C_BUNDLES);
+ if (ids == null)
return Collections.emptyList();
return ids;
}
-
public List<IBldBundle> getBundles()
{
ArrayList<IBldBundle> list = new ArrayList<IBldBundle>();
- for ( String id : getBundleIds() )
+ for (String id : getBundleIds())
{
- list.add( new BldBundle( id ) );
+ list.add(new BldBundle(id));
}
return list;
}
-
// Implement IBldConfig: getRepositoryConfig
public Map<String, Properties> getRepositoryConfig()
{
HashMap<String, Properties> map = new HashMap<String, Properties>();
- for ( String name : config.getList( null, BldConfig.C_REPOSITORIES ) )
+ for (String name : config.getList(null, BldConfig.C_REPOSITORIES))
{
- Properties repo = config.getProps( null, name );
+ Properties repo = config.getProps(null, name);
- for ( Object k : repo.keySet() )
+ for (Object k : repo.keySet())
{
- String key = ( String ) k;
- String value = repo.getProperty( key );
+ String key = (String) k;
+ String value = repo.getProperty(key);
- String expand = BldUtil.expand( value, new BldProperties(this));
+ String expand = BldUtil.expand(value, new BldProperties(this));
- if ( !value.equals( expand ) )
+ if (!value.equals(expand))
{
value = expand;
- repo.setProperty( key, value );
- }
-
- // backwards compatible support before ${.} and ${..} was added
- if ( value.startsWith( "./" ) || value.startsWith( "../" ) )
- {
- try
- {
- // need canonical path, to normalise
- value = resolve( value ).getCanonicalPath();
- }
- catch ( IOException e )
- {
- }
- repo.setProperty( key, value );
+ repo.setProperty(key, value);
}
}
- map.put( name, repo );
+ map.put(name, repo);
}
return map;
}
-
public Properties getOptions()
{
- return config.getProps( null, BldConfig.P_OPTION );
+ return config.getProps(null, BldConfig.P_OPTION);
}
-
public Properties getDefaultPackageVersions()
{
- return config.getProps( null, BldConfig.P_PACKAGE_VERSION );
+ return config.getProps(null, BldConfig.P_PACKAGE_VERSION);
}
-
public ISigilBundle getDefaultBundle()
{
List<String> bundles = getBundleIds();
- if ( bundles.isEmpty() )
+ if (bundles.isEmpty())
return null;
- String id = bundles.get( 0 );
- return getSigilBundle( id );
+ String id = bundles.get(0);
+ return getSigilBundle(id);
}
-
- public ISigilBundle getSigilBundle( String id )
+ public ISigilBundle getSigilBundle(String id)
{
- BldBundle bundle = new BldBundle( id );
- return convert.getBundle( id, bundle );
+ BldBundle bundle = new BldBundle(id);
+ return convert.getBundle(id, bundle);
}
-
- public void setDefaultBundle( ISigilBundle bundle )
+ public void setDefaultBundle(ISigilBundle bundle)
{
- setSigilBundle( null, bundle );
+ setSigilBundle(null, bundle);
}
-
- public void setSigilBundle( String id, ISigilBundle bundle )
+ public void setSigilBundle(String id, ISigilBundle bundle)
{
List<String> ids = getBundleIds();
- if ( ids.isEmpty() )
+ if (ids.isEmpty())
{
ArrayList<String> list = new ArrayList<String>();
- list.add( id == null ? bundle.getBundleInfo().getSymbolicName() : id );
- config.setList( null, BldConfig.C_BUNDLES, list );
+ list.add(id == null ? bundle.getBundleInfo().getSymbolicName() : id);
+ config.setList(null, BldConfig.C_BUNDLES, list);
}
- else if ( id == null )
+ else if (id == null)
{
- id = ids.get( 0 );
+ id = ids.get(0);
}
- else if ( !ids.contains( id ) )
+ else if (!ids.contains(id))
{
- List<String> list = config.getList( null, BldConfig.C_BUNDLES );
- list.add( id );
- config.setList( null, BldConfig.C_BUNDLES, list );
+ List<String> list = config.getList(null, BldConfig.C_BUNDLES);
+ list.add(id);
+ config.setList(null, BldConfig.C_BUNDLES, list);
}
- if ( ids.size() == 1 )
+ if (ids.size() == 1)
id = null; // don't prefix default bundle with id
- convert.setBundle( id, bundle );
+ convert.setBundle(id, bundle);
}
-
public void save() throws IOException
{
- saveAs( new File( loc ) );
+ saveAs(new File(loc));
}
-
- public void saveAs( File path ) throws IOException
+ public void saveAs(File path) throws IOException
{
- File part = new File( path.getPath() + ".part" );
- saveTo( new FileOutputStream( ( part ) ) );
+ File part = new File(path.getPath() + ".part");
+ saveTo(new FileOutputStream((part)));
path.delete();
- if ( !part.renameTo( path ) )
- throw new IOException( "failed to rename " + part + " to " + path );
+ if (!part.renameTo(path))
+ throw new IOException("failed to rename " + part + " to " + path);
}
-
- public void saveTo( OutputStream out )
+ public void saveTo(OutputStream out)
{
- PrintWriter writer = new PrintWriter( new OutputStreamWriter( out ) );
- config.write( writer );
+ PrintWriter writer = new PrintWriter(new OutputStreamWriter(out));
+ config.write(writer);
writer.close();
}
-
public List<String> getSourceDirs()
{
- List<String> list = config.getList( null, BldConfig.L_SRC_CONTENTS );
+ List<String> list = config.getList(null, BldConfig.L_SRC_CONTENTS);
return list != null ? list : Collections.<String> emptyList();
}
-
public List<String> getSourcePkgs()
{
- if ( sourcePkgs == null )
+ if (sourcePkgs == null)
{
sourcePkgs = new ArrayList<String>();
- for ( String src : getSourceDirs() )
+ for (String src : getSourceDirs())
{
- File dir = resolve( src );
- if ( !dir.isDirectory() )
+ File dir = resolve(src);
+ if (!dir.isDirectory())
{
- System.err.println( "WARN: sourcedir does not exist: " + dir );
+ System.err.println("WARN: sourcedir does not exist: " + dir);
continue;
// throw new RuntimeException("sourcedir: " + dir +
// " : is not a directory.");
}
- findSrcPkgs( dir, null, sourcePkgs );
+ findSrcPkgs(dir, null, sourcePkgs);
}
}
return sourcePkgs;
}
-
- private void findSrcPkgs( File dir, String pkg, List<String> result )
+ private void findSrcPkgs(File dir, String pkg, List<String> result)
{
ArrayList<File> dirs = new ArrayList<File>();
boolean found = false;
- for ( String name : dir.list() )
+ for (String name : dir.list())
{
- if ( name.endsWith( ".java" ) )
+ if (name.endsWith(".java"))
{
found = true;
}
- else if ( !name.equals( ".svn" ) )
+ else if (!name.equals(".svn"))
{
- File d = new File( dir, name );
- if ( d.isDirectory() )
- dirs.add( d );
+ File d = new File(dir, name);
+ if (d.isDirectory())
+ dirs.add(d);
}
}
- if ( pkg == null )
+ if (pkg == null)
{
pkg = "";
}
- else if ( pkg.equals( "" ) )
+ else if (pkg.equals(""))
{
pkg = dir.getName();
}
@@ -800,11 +766,11 @@
pkg = pkg + "." + dir.getName();
}
- if ( found )
- result.add( pkg );
+ if (found)
+ result.add(pkg);
- for ( File d : dirs )
- findSrcPkgs( d, pkg, result );
+ for (File d : dirs)
+ findSrcPkgs(d, pkg, result);
}
/**
@@ -815,155 +781,145 @@
{
private String id;
-
- public BldBundle( String id )
+ public BldBundle(String id)
{
this.id = id;
}
-
- public File resolve( String path )
+ public File resolve(String path)
{
- return BldProject.this.resolve( path );
+ return BldProject.this.resolve(path);
}
-
- private String getString( String key )
+ private String getString(String key)
{
- return config.getString( id, key );
+ return config.getString(id, key);
}
-
- private boolean getBoolean( String key )
+ private boolean getBoolean(String key)
{
- return Boolean.parseBoolean( getString( key ) );
+ return Boolean.parseBoolean(getString(key));
}
-
- private List<String> getList( String key )
+ private List<String> getList(String key)
{
- List<String> list = config.getList( id, key );
+ List<String> list = config.getList(id, key);
return list != null ? list : Collections.<String> emptyList();
}
-
- private Map<String, Map<String, String>> getMap( String key )
+ private Map<String, Map<String, String>> getMap(String key)
{
- Map<String, Map<String, String>> map = config.getMap( id, key );
- return map != null ? map : Collections.<String, Map<String, String>> emptyMap();
+ Map<String, Map<String, String>> map = config.getMap(id, key);
+ return map != null ? map
+ : Collections.<String, Map<String, String>> emptyMap();
}
-
public String getActivator()
{
- return getString( BldConfig.S_ACTIVATOR );
+ return getString(BldConfig.S_ACTIVATOR);
}
-
public String getId()
{
- String name = getString( "id" );
+ String name = getString("id");
return name != null ? name : id;
}
-
public String getVersion()
{
- String ver = getString( BldConfig.S_VERSION );
- if ( ver == null )
+ String ver = getString(BldConfig.S_VERSION);
+ if (ver == null)
{
ver = BldProject.this.getVersion();
}
return ver;
}
-
public String getSymbolicName()
{
- String name = getString( BldConfig.S_SYM_NAME );
+ String name = getString(BldConfig.S_SYM_NAME);
return name != null ? name : getId();
}
-
public boolean isSingleton()
{
- return getBoolean( BldConfig.S_SINGLETON );
+ return getBoolean(BldConfig.S_SINGLETON);
}
-
public List<IPackageExport> getExports()
{
ArrayList<IPackageExport> list = new ArrayList<IPackageExport>();
- Map<String, Map<String, String>> exports = getMap( BldConfig.M_EXPORTS );
+ Map<String, Map<String, String>> exports = getMap(BldConfig.M_EXPORTS);
- if ( exports != null )
+ if (exports != null)
{
- for ( String name : exports.keySet() )
+ for (String name : exports.keySet())
{
- Map<String, String> attrs = exports.get( name );
+ Map<String, String> attrs = exports.get(name);
PackageExport pkgExport = new PackageExport();
- pkgExport.setPackageName( name );
+ pkgExport.setPackageName(name);
- String version = attrs.get( BldAttr.VERSION_ATTRIBUTE );
+ String version = attrs.get(BldAttr.VERSION_ATTRIBUTE);
// only default export version from local packages
- if ( version == null && ( getSourcePkgs().isEmpty() || getSourcePkgs().contains( name ) ) )
+ if (version == null
+ && (getSourcePkgs().isEmpty() || getSourcePkgs().contains(name)))
{
version = getVersion();
}
- if ( version != null )
- pkgExport.setVersion( new Version( version ) );
+ if (version != null)
+ pkgExport.setVersion(new Version(version));
- list.add( pkgExport );
+ list.add(pkgExport);
}
}
return list;
}
-
public List<IPackageImport> getImports()
{
ArrayList<IPackageImport> list = new ArrayList<IPackageImport>();
- for ( IPackageImport import1 : getRequirements().childrenOfType( IPackageImport.class ) )
+ for (IPackageImport import1 : getRequirements().childrenOfType(
+ IPackageImport.class))
{
- list.add( import1 );
+ list.add(import1);
}
return list;
}
-
public List<IRequiredBundle> getRequires()
{
ArrayList<IRequiredBundle> list = new ArrayList<IRequiredBundle>();
- list.addAll( Arrays.asList( getRequirements().childrenOfType( IRequiredBundle.class ) ) );
+ list.addAll(Arrays.asList(getRequirements().childrenOfType(
+ IRequiredBundle.class)));
- for ( IBldBundle bundle : getBundles() )
+ for (IBldBundle bundle : getBundles())
{
IRequiredBundle fh = bundle.getFragmentHost();
- if ( fh != null )
- list.remove( fh );
+ if (fh != null)
+ list.remove(fh);
}
return list;
}
-
public IRequiredBundle getFragmentHost()
{
IRequiredBundle fragment = null;
- Map<String, Map<String, String>> fragments = getMap( BldConfig.M_FRAGMENT );
- if ( fragments != null )
+ Map<String, Map<String, String>> fragments = getMap(BldConfig.M_FRAGMENT);
+ if (fragments != null)
{
- for ( String name : fragments.keySet() )
+ for (String name : fragments.keySet())
{
- Map<String, String> attr = fragments.get( name );
- String versions = attr.isEmpty() ? null : attr.get( BldAttr.VERSION_ATTRIBUTE );
+ Map<String, String> attr = fragments.get(name);
+ String versions = attr.isEmpty() ? null
+ : attr.get(BldAttr.VERSION_ATTRIBUTE);
fragment = new RequiredBundle();
- fragment.setSymbolicName( name );
- fragment.setVersions( VersionRange.parseVersionRange( versions ) );
+ fragment.setSymbolicName(name);
+ fragment.setVersions(VersionRange.parseVersionRange(versions));
break;
}
}
@@ -971,47 +927,43 @@
return fragment;
}
-
public Map<String, Map<String, String>> getLibs()
{
- Map<String, Map<String, String>> libs = getMap( BldConfig.M_LIBS );
- return ( libs != null ) ? libs : Collections.<String, Map<String, String>> emptyMap();
+ Map<String, Map<String, String>> libs = getMap(BldConfig.M_LIBS);
+ return (libs != null) ? libs
+ : Collections.<String, Map<String, String>> emptyMap();
}
-
public List<String> getContents()
{
- return getList( BldConfig.L_CONTENTS );
+ return getList(BldConfig.L_CONTENTS);
}
-
public Map<String, String> getResources()
{
HashMap<String, String> map = new HashMap<String, String>();
- List<String> resources = getList( BldConfig.L_RESOURCES );
+ List<String> resources = getList(BldConfig.L_RESOURCES);
- if ( resources != null )
+ if (resources != null)
{
- for ( String resource : resources )
+ for (String resource : resources)
{
- String[] paths = resource.split( "=", 2 );
- String fsPath = ( paths.length > 1 ? paths[1] : "" );
- map.put( paths[0], fsPath );
+ String[] paths = resource.split("=", 2);
+ String fsPath = (paths.length > 1 ? paths[1] : "");
+ map.put(paths[0], fsPath);
}
}
return map;
}
-
public Properties getHeaders()
{
- Properties headers = config.getProps( id, BldConfig.P_HEADER );
+ Properties headers = config.getProps(id, BldConfig.P_HEADER);
return headers;
}
}
-
public long getLastModified()
{
return lastModified;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
index 006c25f..c8cb869 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
@@ -42,26 +42,33 @@
try
{
- URL testURL = new URL(urlStr);
- if (testURL.openConnection().getLastModified() == 0)
- throw new RepositoryException("Failed to connect to repository: "
- + urlStr);
-
URL repositoryURL = new URL(urlStr);
File indexCache = new File(preferences.getProperty("index"));
File localCache = new File(preferences.getProperty("cache"));
+ String auth = preferences.getProperty("auth");
+ File authFile = auth == null ? null : new File(auth);
+ URL testURL = new URL(urlStr);
+
+ if (testURL.openConnection().getLastModified() == 0)
+ {
+ String msg = "Failed to read OBR index: ";
+ if (!indexCache.exists())
+ throw new RepositoryException(msg + urlStr);
+ System.err.println("WARNING: " + msg + "using cache: " + urlStr);
+ }
+
// TODO create user configurable updatePeriod
long updatePeriod = TimeUnit.MILLISECONDS.convert(60 * 60 * 24 * 7,
TimeUnit.SECONDS);
if (preferences.getProperty("inmemory") == null)
{
return new NonCachingOBRBundleRepository(id, repositoryURL, indexCache,
- localCache, updatePeriod);
+ localCache, updatePeriod, authFile);
}
else
{
return new CachingOBRBundleRepository(id, repositoryURL, indexCache,
- localCache, updatePeriod);
+ localCache, updatePeriod, authFile);
}
}
catch (IOException e)
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
index 6b5484c..c9e60dc 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/AbstractOBRBundleRepository.java
@@ -19,8 +19,8 @@
package org.apache.felix.sigil.obr.impl;
-
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -28,6 +28,7 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
+import java.util.Properties;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
@@ -36,7 +37,6 @@
import org.apache.felix.sigil.repository.AbstractBundleRepository;
import org.xml.sax.SAXException;
-
public abstract class AbstractOBRBundleRepository extends AbstractBundleRepository
{
private static SAXParserFactory factory = SAXParserFactory.newInstance();
@@ -45,78 +45,106 @@
private File obrlCache;
private File bundleCache;
private long updatePeriod;
+ private final File authFile;
+ private final Properties authMap = new Properties();
+ private long authLastModified;
-
- public AbstractOBRBundleRepository( String id, URL repositoryURL, File obrCache, File bundleCache, long updatePeriod )
+ public AbstractOBRBundleRepository(String id, URL repositoryURL, File obrCache, File bundleCache, long updatePeriod, File authFile)
{
- super( id );
+ super(id);
this.obrURL = repositoryURL;
- this.obrlCache = obrCache;
+ this.obrlCache = (repositoryURL.getProtocol().equals("file") ? null : obrCache);
this.bundleCache = bundleCache;
this.updatePeriod = updatePeriod;
+ this.authFile = authFile;
}
-
public void refresh()
{
- obrlCache.delete();
+ if (obrlCache != null)
+ obrlCache.delete();
}
-
- protected void readBundles( OBRListener listener )
+ protected void readBundles(OBRListener listener)
{
File index = syncOBRIndex();
- OBRHandler handler = new OBRHandler( getObrURL(), getBundleCache(), listener );
+ OBRHandler handler = new OBRHandler(getObrURL(), getBundleCache(), listener);
try
{
SAXParser parser = factory.newSAXParser();
- parser.parse( index, handler );
+ if (getObrlCache() != null)
+ parser.parse(index, handler);
+ else
+ parser.parse(getObrURL().toExternalForm(), handler);
}
- catch ( ParserConfigurationException e )
+ catch (ParserConfigurationException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
- catch ( SAXException e )
+ catch (SAXException e)
{
- System.out.println( "Failed to parse " + index );
+ System.out.println("Failed to parse " + index);
// TODO Auto-generated catch block
e.printStackTrace();
}
- catch ( IOException e )
+ catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
}
+ private String getAuth(String url) throws IOException
+ {
+ if (authFile == null)
+ return null;
+
+ if (authFile.lastModified() > authLastModified)
+ {
+ authMap.clear();
+ authMap.load(new FileInputStream(authFile));
+ }
+
+ String authKey = "";
+
+ for (Object okey : authMap.keySet())
+ {
+ String key = (String) okey;
+ if (url.startsWith(key) && key.length() > authKey.length())
+ authKey = key;
+ }
+
+ return authMap.getProperty(authKey);
+ }
private File syncOBRIndex()
{
File file = null;
- if ( "file".equals( getObrURL().getProtocol() ) ) {
+ if ("file".equals(getObrURL().getProtocol()))
+ {
try
{
- file = new File( getObrURL().toURI() );
+ file = new File(getObrURL().toURI());
}
- catch ( URISyntaxException e )
+ catch (URISyntaxException e)
{
// should be impossible ?
- throw new IllegalStateException( "Failed to convert file url to uri", e );
- }
+ throw new IllegalStateException("Failed to convert file url to uri", e);
+ }
}
- else {
+ else
+ {
file = getObrlCache();
- if ( isUpdated() )
+ if (isUpdated())
{
cacheIndex(file);
}
}
-
+
return file;
}
-
private void cacheIndex(File file)
{
InputStream in = null;
@@ -124,50 +152,56 @@
try
{
- URLConnection c = getObrURL().openConnection();
+ URL url = getObrURL();
+ URLConnection c = url.openConnection();
+ String auth = getAuth(url.toString());
+ if (auth != null)
+ {
+ c.setRequestProperty("Authorization", "Basic " + auth);
+ }
+
c.connect();
in = c.getInputStream();
- if ( !file.getParentFile().exists() && !file.getParentFile().mkdirs() )
+ if (!file.getParentFile().exists() && !file.getParentFile().mkdirs())
{
- throw new IOException( "Failed to create obr cache dir " + file.getParentFile() );
+ throw new IOException("Failed to create obr cache dir "
+ + file.getParentFile());
}
- out = new FileOutputStream( file );
- stream( in, out );
+ out = new FileOutputStream(file);
+ stream(in, out);
}
- catch ( IOException e )
+ catch (IOException e)
{
- // TODO Auto-generated catch block
e.printStackTrace();
- getObrlCache().setLastModified( 0 );
+ getObrlCache().setLastModified(0);
}
finally
{
- close( in, out );
+ close(in, out);
}
}
-
- private void close( InputStream in, OutputStream out )
+ private void close(InputStream in, OutputStream out)
{
- if ( in != null )
+ if (in != null)
{
try
{
in.close();
}
- catch ( IOException e )
+ catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
}
- if ( out != null )
+ if (out != null)
{
try
{
out.close();
}
- catch ( IOException e )
+ catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
@@ -175,52 +209,47 @@
}
}
-
- private void stream( InputStream in, OutputStream out ) throws IOException
+ private void stream(InputStream in, OutputStream out) throws IOException
{
byte[] buf = new byte[1024];
- for ( ;; )
+ for (;;)
{
- int r = in.read( buf );
- if ( r == -1 )
+ int r = in.read(buf);
+ if (r == -1)
{
break;
}
- out.write( buf, 0, r );
+ out.write(buf, 0, r);
}
out.flush();
}
-
private boolean isUpdated()
{
- if ( !getObrlCache().exists() )
- {
+ if (getObrlCache() == null)
+ return false;
+
+ if (!getObrlCache().exists())
return true;
- }
return getObrlCache().lastModified() + getUpdatePeriod() < System.currentTimeMillis();
}
-
private URL getObrURL()
{
return obrURL;
}
-
private File getObrlCache()
{
return obrlCache;
}
-
private File getBundleCache()
{
return bundleCache;
}
-
private long getUpdatePeriod()
{
return updatePeriod;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
index 8fb7dea..b56daa8 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/CachingOBRBundleRepository.java
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.obr.impl;
-
import java.io.File;
import java.lang.ref.SoftReference;
import java.net.URL;
@@ -29,58 +28,53 @@
import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.apache.felix.sigil.repository.IRepositoryVisitor;
-
public class CachingOBRBundleRepository extends AbstractOBRBundleRepository
{
private SoftReference<List<ISigilBundle>> bundles;
-
- public CachingOBRBundleRepository( String id, URL repositoryURL, File obrCache, File bundleCache, long updatePeriod )
+ public CachingOBRBundleRepository(String id, URL repositoryURL, File obrCache, File bundleCache, long updatePeriod, File authFile)
{
- super( id, repositoryURL, obrCache, bundleCache, updatePeriod );
+ super(id, repositoryURL, obrCache, bundleCache, updatePeriod, authFile);
}
-
@Override
- public void accept( IRepositoryVisitor visitor, int options )
+ public void accept(IRepositoryVisitor visitor, int options)
{
- for ( ISigilBundle b : loadFromCache( options ) )
+ for (ISigilBundle b : loadFromCache(options))
{
- if ( !visitor.visit( b ) )
+ if (!visitor.visit(b))
{
break;
}
}
}
-
public synchronized void refresh()
{
super.refresh();
- if ( bundles != null )
+ if (bundles != null)
{
bundles.clear();
notifyChange();
}
}
-
- private synchronized List<ISigilBundle> loadFromCache( int options )
+ private synchronized List<ISigilBundle> loadFromCache(int options)
{
List<ISigilBundle> cached = bundles == null ? null : bundles.get();
- if ( cached == null )
+ if (cached == null)
{
final LinkedList<ISigilBundle> read = new LinkedList<ISigilBundle>();
- readBundles( new OBRListener()
+ readBundles(new OBRListener()
{
- public void handleBundle( ISigilBundle bundle )
+ public void handleBundle(ISigilBundle bundle)
{
- read.add( bundle );
+ read.add(bundle);
}
- } );
+ });
cached = read;
- bundles = new SoftReference<List<ISigilBundle>>( cached );
+ bundles = new SoftReference<List<ISigilBundle>>(cached);
}
return cached;
diff --git a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
index 8e34224..f4c2258 100644
--- a/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
+++ b/sigil/common/obr/src/org/apache/felix/sigil/obr/impl/NonCachingOBRBundleRepository.java
@@ -19,14 +19,12 @@
package org.apache.felix.sigil.obr.impl;
-
import java.io.File;
import java.net.URL;
import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.apache.felix.sigil.repository.IRepositoryVisitor;
-
public class NonCachingOBRBundleRepository extends AbstractOBRBundleRepository
{
@@ -45,29 +43,26 @@
});
} */
- public NonCachingOBRBundleRepository( String id, URL repositoryURL, File obrCache, File bundleCache,
- long updatePeriod )
+ public NonCachingOBRBundleRepository(String id, URL repositoryURL, File obrCache, File bundleCache, long updatePeriod, File authFile)
{
- super( id, repositoryURL, obrCache, bundleCache, updatePeriod );
+ super(id, repositoryURL, obrCache, bundleCache, updatePeriod, authFile);
}
-
@Override
- public void accept( final IRepositoryVisitor visitor, int options )
+ public void accept(final IRepositoryVisitor visitor, int options)
{
- readBundles( new OBRListener()
+ readBundles(new OBRListener()
{
boolean visit = true;
-
- public void handleBundle( ISigilBundle bundle )
+ public void handleBundle(ISigilBundle bundle)
{
- if ( visit )
+ if (visit)
{
- visit = visitor.visit( bundle );
+ visit = visitor.visit(bundle);
}
}
- } );
+ });
}
}
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
index 55dffb9..de52b52 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
@@ -73,15 +73,23 @@
// cache is directory where synchronized bundles are stored;
// not needed in ivy.
repo.setProperty("cache", "/no-cache");
+ String index = repo.getProperty("index");
- if (!repo.containsKey("index"))
+ if (index == null)
{
- // index is created as copy of url
+ // index is created to cache OBR url
File indexFile = new File(System.getProperty("java.io.tmpdir"),
"obr-index-" + name);
indexFile.deleteOnExit();
repo.setProperty("index", indexFile.getAbsolutePath());
}
+ else
+ {
+ if (!new File(index).getParentFile().mkdirs())
+ {
+ // ignore - but keeps findbugs happy
+ }
+ }
}
int level = Integer.parseInt(repo.getProperty(
@@ -97,10 +105,10 @@
}
catch (Exception e)
{
- String msg = "failed to create repository: " + repo + " : " + e;
+ String msg = "failed to create repository: ";
if (!optional)
- throw new Error(msg, e);
- System.err.println("WARNING: " + msg);
+ throw new Error(msg + repo + " " + e, e);
+ System.err.println("WARNING: " + msg + e);
}
}
}
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/FindUtil.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/FindUtil.java
index 98525ad..a0c5d01 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/FindUtil.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/FindUtil.java
@@ -19,60 +19,57 @@
package org.apache.felix.sigil.ivy;
-
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-
public class FindUtil
{
static final String WILD_ANY = "[^.].*";
static final String WILD_ONE = "[^.][^;]*"; // WILD_ONE.endsWith(WILD_ANY) == false
-
// example pattern: ${repository}/projects/abc*/*/project.sigil
- public static Collection<File> findFiles( String pattern ) throws IOException
+ public static Collection<File> findFiles(String pattern) throws IOException
{
- int star = pattern.indexOf( "*" );
- if ( star == -1 )
+ int star = pattern.indexOf("*");
+ if (star == -1)
{
- throw new IOException( "pattern doesn't contain '*': " + pattern );
+ throw new IOException("pattern doesn't contain '*': " + pattern);
}
- int slash = pattern.lastIndexOf( '/', star );
+ int slash = pattern.lastIndexOf('/', star);
- String regex = pattern.substring( slash + 1 );
- regex = regex.replaceAll( "\\*\\*", "-wildany-" );
- regex = regex.replaceAll( "\\*", "-wildone-" );
- regex = regex.replaceAll( "-wildany-", WILD_ANY );
- regex = regex.replaceAll( "-wildone-", WILD_ONE );
+ String regex = pattern.substring((slash == -1) ? 0 : slash + 1);
+ regex = regex.replaceAll("\\*\\*", "-wildany-");
+ regex = regex.replaceAll("\\*", "-wildone-");
+ regex = regex.replaceAll("-wildany-", WILD_ANY);
+ regex = regex.replaceAll("-wildone-", WILD_ONE);
- String[] patterns = regex.split( "/" );
+ String[] patterns = regex.split("/");
ArrayList<File> list = new ArrayList<File>();
- File root = new File( pattern.substring( 0, slash ) );
+ File root = new File(slash == -1 ? "." : pattern.substring(0, slash));
- if ( root.isDirectory() )
+ if (root.isDirectory())
{
- findFiles( root, 0, patterns, list );
+ findFiles(root, 0, patterns, list);
}
else
{
- throw new IOException( "pattern root directory does not exist: " + root );
+ throw new IOException("pattern root directory does not exist: " + root);
}
return list;
}
-
- private static void findFiles( File dir, int level, String[] patterns, Collection<File> list )
+ private static void findFiles(File dir, int level, String[] patterns,
+ Collection<File> list)
{
final String filePattern = patterns[patterns.length - 1];
final String dirPattern;
- if ( level < patterns.length - 1 )
+ if (level < patterns.length - 1)
{
dirPattern = patterns[level];
}
@@ -82,7 +79,8 @@
}
final boolean stillWild;
- if ( ( level > 0 ) && ( level < patterns.length ) && patterns[level - 1].endsWith( WILD_ANY ) )
+ if ((level > 0) && (level < patterns.length)
+ && patterns[level - 1].endsWith(WILD_ANY))
{
stillWild = true;
}
@@ -91,34 +89,35 @@
stillWild = false;
}
- for ( File path : dir.listFiles( new FileFilter()
+ for (File path : dir.listFiles(new FileFilter()
{
- public boolean accept( File pathname )
+ public boolean accept(File pathname)
{
String name = pathname.getName();
- if ( pathname.isDirectory() )
+ if (pathname.isDirectory())
{
- return name.matches( dirPattern ) || ( stillWild && name.matches( WILD_ANY ) );
+ return name.matches(dirPattern)
+ || (stillWild && name.matches(WILD_ANY));
}
- else if ( dirPattern.equals( "/" ) || dirPattern.equals( WILD_ANY ) )
+ else if (dirPattern.equals("/") || dirPattern.equals(WILD_ANY))
{
- return name.matches( filePattern );
+ return name.matches(filePattern);
}
else
{
return false;
}
}
- } ) )
+ }))
{
- if ( path.isDirectory() )
+ if (path.isDirectory())
{
- int inc = path.getName().matches( dirPattern ) ? 1 : 0;
- findFiles( path, level + inc, patterns, list );
+ int inc = path.getName().matches(dirPattern) ? 1 : 0;
+ findFiles(path, level + inc, patterns, list);
}
else
{
- list.add( path );
+ list.add(path);
}
}
}
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
index 004b4d5..ead0f73 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
@@ -19,7 +19,6 @@
package org.apache.felix.sigil.ivy;
-
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -47,95 +46,92 @@
import org.osgi.framework.Version;
-
public class ProjectRepository extends AbstractBundleRepository
{
private ArrayList<ISigilBundle> bundles;
private ArrayList<ISigilBundle> wildBundles;
private String projectFilePattern;
-
- /* package */ProjectRepository( String id, String projectFilePattern )
+ /* package */ProjectRepository(String id, String projectFilePattern)
{
- super( id );
- this.projectFilePattern = projectFilePattern.replaceAll( "\\[sigilproject\\]", IBldProject.PROJECT_FILE );
+ super(id);
+ this.projectFilePattern = projectFilePattern.replaceAll("\\[sigilproject\\]",
+ IBldProject.PROJECT_FILE);
}
-
@Override
- public void accept( IRepositoryVisitor visitor, int options )
+ public void accept(IRepositoryVisitor visitor, int options)
{
- for ( ISigilBundle b : getBundles() )
+ for (ISigilBundle b : getBundles())
{
- if ( !visitor.visit( b ) )
+ if (!visitor.visit(b))
{
break;
}
}
}
-
// override to provide fuzzy matching for wild-card exports.
@Override
- public Collection<ISigilBundle> findAllProviders( final IPackageImport pi, int options )
+ public Collection<ISigilBundle> findAllProviders(final IPackageImport pi, int options)
{
- return findProviders( pi, options, false );
+ return findProviders(pi, options, false);
}
-
@Override
- public ISigilBundle findProvider( IPackageImport pi, int options )
+ public ISigilBundle findProvider(IPackageImport pi, int options)
{
- Collection<ISigilBundle> found = findProviders( pi, options, true );
+ Collection<ISigilBundle> found = findProviders(pi, options, true);
return found.isEmpty() ? null : found.iterator().next();
}
-
- private Collection<ISigilBundle> findProviders( final IPackageImport pi, int options, boolean findFirst )
+ private Collection<ISigilBundle> findProviders(final IPackageImport pi, int options,
+ boolean findFirst)
{
ArrayList<ISigilBundle> found = new ArrayList<ISigilBundle>();
- ILicensePolicy policy = findPolicy( pi );
+ ILicensePolicy policy = findPolicy(pi);
String name = pi.getPackageName();
VersionRange versions = pi.getVersions();
// find exact match(es)
- for ( ISigilBundle bundle : getBundles() )
+ for (ISigilBundle bundle : getBundles())
{
- if ( policy.accept( bundle ) )
+ if (policy.accept(bundle))
{
- for ( IPackageExport exp : bundle.getBundleInfo().getExports() )
+ for (IPackageExport exp : bundle.getBundleInfo().getExports())
{
- if ( name.equals( exp.getPackageName() ) && versions.contains( exp.getVersion() ) )
+ if (name.equals(exp.getPackageName())
+ && versions.contains(exp.getVersion()))
{
- found.add( bundle );
- if ( findFirst )
+ found.add(bundle);
+ if (findFirst)
return found;
}
}
}
}
- if ( !found.isEmpty() )
+ if (!found.isEmpty())
return found;
// find best fuzzy match
ISigilBundle fuzzyMatch = null;
int fuzzyLen = 0;
- for ( ISigilBundle bundle : getWildBundles() )
+ for (ISigilBundle bundle : getWildBundles())
{
- if ( policy.accept( bundle ) )
+ if (policy.accept(bundle))
{
- for ( IPackageExport exp : bundle.getBundleInfo().getExports() )
+ for (IPackageExport exp : bundle.getBundleInfo().getExports())
{
String export = exp.getPackageName();
- if ( export.endsWith( "*" ) )
+ if (export.endsWith("*"))
{
- String export1 = export.substring( 0, export.length() - 1 );
- if ( ( name.startsWith( export1 ) || export1.equals( name + "." ) )
- && versions.contains( exp.getVersion() ) )
+ String export1 = export.substring(0, export.length() - 1);
+ if ((name.startsWith(export1) || export1.equals(name + "."))
+ && versions.contains(exp.getVersion()))
{
- if ( export1.length() > fuzzyLen )
+ if (export1.length() > fuzzyLen)
{
fuzzyLen = export1.length();
fuzzyMatch = bundle;
@@ -146,89 +142,87 @@
}
}
- if ( fuzzyMatch != null )
- found.add( fuzzyMatch );
+ if (fuzzyMatch != null)
+ found.add(fuzzyMatch);
return found;
}
-
private synchronized void init()
{
- System.out.println( "Sigil: loading Project Repository: " + projectFilePattern );
+ System.out.println("Sigil: loading Project Repository: " + projectFilePattern);
ArrayList<File> projects = new ArrayList<File>();
- for ( String pattern : projectFilePattern.split( "\\s+" ) )
+ for (String pattern : projectFilePattern.split("\\s+"))
{
try
{
- Collection<File> files = FindUtil.findFiles( pattern );
- if ( files.isEmpty() )
+ Collection<File> files = FindUtil.findFiles(pattern);
+ if (files.isEmpty())
{
- Log.warn( "ProjectRepository: no projects match: " + pattern );
+ Log.warn("ProjectRepository: no projects match: " + pattern);
}
else
{
- projects.addAll( files );
+ projects.addAll(files);
}
}
- catch ( IOException e )
+ catch (IOException e)
{
// pattern root dir does not exist
- Log.error( "ProjectRepository: " + pattern + ": " + e.getMessage() );
+ Log.error("ProjectRepository: " + pattern + ": " + e.getMessage());
}
}
- if ( projects.isEmpty() )
+ if (projects.isEmpty())
{
- throw new IllegalArgumentException( "ProjectRepository: no projects found using pattern: "
- + projectFilePattern );
+ throw new IllegalArgumentException(
+ "ProjectRepository: no projects found using pattern: "
+ + projectFilePattern + " pwd=" + new File("").getAbsolutePath());
}
bundles = new ArrayList<ISigilBundle>();
- for ( File proj : projects )
+ for (File proj : projects)
{
try
{
- addBundles( proj, bundles );
+ addBundles(proj, bundles);
}
- catch ( IOException e )
+ catch (IOException e)
{
- Log.warn( "Skipping project: " + proj + ": " + e.getMessage() );
+ Log.warn("Skipping project: " + proj + ": " + e.getMessage());
}
- catch ( ParseException e )
+ catch (ParseException e)
{
- Log.warn( "Skipping project: " + proj + ": " + e.getMessage() );
+ Log.warn("Skipping project: " + proj + ": " + e.getMessage());
}
}
}
-
private List<ISigilBundle> getBundles()
{
- if ( bundles == null )
+ if (bundles == null)
{
init();
}
return bundles;
}
-
private List<ISigilBundle> getWildBundles()
{
- if ( wildBundles == null )
+ if (wildBundles == null)
{
wildBundles = new ArrayList<ISigilBundle>();
- for ( ISigilBundle bundle : getBundles() )
+ for (ISigilBundle bundle : getBundles())
{
- for ( IPackageExport exp : bundle.getBundleInfo().getExports() )
+ for (IPackageExport exp : bundle.getBundleInfo().getExports())
{
String export = exp.getPackageName();
- if ( export.endsWith( "*" ) )
+ if (export.endsWith("*"))
{
- wildBundles.add( bundle );
+ wildBundles.add(bundle);
break;
}
}
@@ -237,7 +231,6 @@
return wildBundles;
}
-
public void refresh()
{
bundles = null;
@@ -245,55 +238,55 @@
notifyChange();
}
-
- private void addBundles( File file, List<ISigilBundle> list ) throws IOException, ParseException
+ private void addBundles(File file, List<ISigilBundle> list) throws IOException,
+ ParseException
{
URI uri = file.getCanonicalFile().toURI();
- IBldProject project = BldFactory.getProject( uri );
+ IBldProject project = BldFactory.getProject(uri);
- for ( IBldBundle bb : project.getBundles() )
+ for (IBldBundle bb : project.getBundles())
{
IBundleModelElement info = new BundleModelElement();
- for ( IPackageExport pexport : bb.getExports() )
+ for (IPackageExport pexport : bb.getExports())
{
- info.addExport( pexport );
+ info.addExport(pexport);
}
- for ( IPackageImport import1 : bb.getImports() )
+ for (IPackageImport import1 : bb.getImports())
{
- IPackageImport clone = ( IPackageImport ) import1.clone();
- clone.setParent( null );
- info.addImport( clone );
+ IPackageImport clone = (IPackageImport) import1.clone();
+ clone.setParent(null);
+ info.addImport(clone);
}
- for ( IRequiredBundle require : bb.getRequires() )
+ for (IRequiredBundle require : bb.getRequires())
{
- IRequiredBundle clone = ( IRequiredBundle ) require.clone();
- clone.setParent( null );
- info.addRequiredBundle( clone );
+ IRequiredBundle clone = (IRequiredBundle) require.clone();
+ clone.setParent(null);
+ info.addRequiredBundle(clone);
}
- info.setSymbolicName( bb.getSymbolicName() );
+ info.setSymbolicName(bb.getSymbolicName());
- Version version = new Version( bb.getVersion() );
- info.setVersion( version );
+ Version version = new Version(bb.getVersion());
+ info.setVersion(version);
ProjectBundle pb = new ProjectBundle();
- pb.setBundleInfo( info );
- pb.setId( bb.getId() );
+ pb.setBundleInfo(info);
+ pb.setId(bb.getId());
- ModuleDescriptor md = SigilParser.instance().parseDescriptor( uri.toURL() );
+ ModuleDescriptor md = SigilParser.instance().parseDescriptor(uri.toURL());
ModuleRevisionId mrid = md.getModuleRevisionId();
- pb.setModule( mrid.getName() );
- pb.setOrg( mrid.getOrganisation() );
+ pb.setModule(mrid.getName());
+ pb.setOrg(mrid.getOrganisation());
// XXX: should revision be configurable?
- pb.setRevision( "latest." + md.getStatus() );
+ pb.setRevision("latest." + md.getStatus());
- list.add( pb );
- Log.debug( "ProjectRepository: added " + pb );
- Log.debug( "ProjectRepository: exports " + bb.getExports() );
+ list.add(pb);
+ Log.debug("ProjectRepository: added " + pb);
+ Log.debug("ProjectRepository: exports " + bb.getExports());
}
}
@@ -304,57 +297,49 @@
private String org;
private String revision;
-
@Override
public String toString()
{
- return "ProjectBundle[" + org + "@" + module + ( id == null ? "" : "$" + id ) + "#" + revision + "]";
+ return "ProjectBundle[" + org + "@" + module + (id == null ? "" : "$" + id)
+ + "#" + revision + "]";
}
-
public String getModule()
{
return module;
}
-
- public void setModule( String module )
+ public void setModule(String module)
{
this.module = module;
}
-
public String getId()
{
return id;
}
-
- public void setId( String id )
+ public void setId(String id)
{
this.id = id;
}
-
public String getRevision()
{
return revision;
}
-
- public void setRevision( String rev )
+ public void setRevision(String rev)
{
this.revision = rev;
}
-
public String getOrg()
{
return org;
}
-
- public void setOrg( String org )
+ public void setOrg(String org)
{
this.org = org;
}