[jboss-osgi-commits] JBoss-OSGI SVN: r94151 - in projects/jboss-osgi/projects/aQute/trunk: aQute.bnd and 11 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-09-30 08:58:26 -0400 (Wed, 30 Sep 2009) New Revision: 94151 Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/activator/ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/activator/Activator.java projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/crap/ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/bcel.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/easymock.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/mina.bar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/mina.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.bnd projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/ro.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.bnd projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/makesondemand.bnd projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/ondemand.bnd projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/bnd.bnd projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/defaultbsn.bnd projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/setsbsn.bnd projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/include.mf projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/simple.mf projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/top.mf projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/variables.mf projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/simple.mf projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/tb1.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/test.jar projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/top.mf Removed: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/craptest/ Modified: projects/jboss-osgi/projects/aQute/trunk/.project projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/.classpath projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/pom.xml projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/BuilderTest.java projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/ClassParserTest.java projects/jboss-osgi/projects/aQute/trunk/aQute.libg/pom.xml projects/jboss-osgi/projects/aQute/trunk/aQute.runtime/pom.xml projects/jboss-osgi/projects/aQute/trunk/aQute.service/.classpath projects/jboss-osgi/projects/aQute/trunk/aQute.service/pom.xml projects/jboss-osgi/projects/aQute/trunk/pom.xml Log: BuilderTest - ok Modified: projects/jboss-osgi/projects/aQute/trunk/.project =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/.project 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/.project 2009-09-30 12:58:26 UTC (rev 94151) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>parent</name> + <name>aQute</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/.classpath =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/.classpath 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/.classpath 2009-09-30 12:58:26 UTC (rev 94151) @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/libg"/> - <classpathentry combineaccessrules="false" kind="src" path="/service"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/pom.xml 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/pom.xml 2009-09-30 12:58:26 UTC (rev 94151) @@ -23,7 +23,7 @@ <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>aQute.parent</artifactId> + <artifactId>aQute</artifactId> <version>0.0.366-SNAPSHOT</version> </parent> @@ -395,7 +395,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <exclude>test/BuilderTest.java</exclude> <exclude>test/ClasspathTest.java</exclude> <exclude>test/ClassReferenceTest.java</exclude> <exclude>test/DiffTest.java</exclude> Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/BuilderTest.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/BuilderTest.java 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/BuilderTest.java 2009-09-30 12:58:26 UTC (rev 94151) @@ -284,17 +284,17 @@ // The file name for the properties is not bnd.bnd, so the // name of the properties file is the default bsn - m = setup(null, new File("src/test/com.acme/defaultbsn.bnd")) + m = setup(null, getFile("test/com.acme/defaultbsn.bnd")) .getMainAttributes(); assertEquals("defaultbsn", m.getValue("Bundle-SymbolicName")); // If the file is called bnd.bnd, then we take the parent directory - m = setup(null, new File("src/test/com.acme/bnd.bnd")) + m = setup(null, getFile("test/com.acme/bnd.bnd")) .getMainAttributes(); assertEquals("com.acme", m.getValue("Bundle-SymbolicName")); // If the file is called bnd.bnd, then we take the parent directory - m = setup(null, new File("src/test/com.acme/setsbsn.bnd")) + m = setup(null, getFile("test/com.acme/setsbsn.bnd")) .getMainAttributes(); assertEquals("is.a.set.bsn", m.getValue("Bundle-SymbolicName")); @@ -392,7 +392,7 @@ Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("-resourceonly", "true"); - p.setProperty("Include-Resource", "bnd=bnd"); + p.setProperty("Include-Resource", "bnd=" + getFile("test/bnd")); bmaker.setProperties(p); Jar jar = bmaker.build(); Map<String, Resource> map = jar.getDirectories().get("bnd"); @@ -425,7 +425,7 @@ public void testConduit() throws Exception { Properties p = new Properties(); - p.setProperty("-conduit", "jar/asm.jar"); + p.setProperty("-conduit", getFile("jar/asm.jar").toString()); Builder b = new Builder(); b.setProperties(p); Jar jars[] = b.builds(); @@ -444,7 +444,7 @@ Builder bmaker = new Builder(); Properties p = new Properties(); p.setProperty("-resourceonly", "true"); - p.setProperty("Include-Resource", "resources=jar"); + p.setProperty("Include-Resource", "resources=" + getFile("jar")); p.setProperty("-exportcontents", "resources"); bmaker.setProperties(p); Jar jar = bmaker.build(); @@ -536,7 +536,7 @@ public void testExportContents() throws Exception { Builder builder = new Builder(); builder.setProperty(Analyzer.INCLUDE_RESOURCE, - "test/activator=src/test/activator"); + "test/activator=src/test/java/test/activator"); builder.setProperty("-exportcontents", "*;x=true"); builder.build(); Manifest manifest = builder.calcManifest(); @@ -565,7 +565,7 @@ */ public void testSplitOverlappingPackages() throws Exception { Builder b = new Builder(); - b.setClasspath(new File[] { new File("bin") }); + b.setClasspath(new File[] { getFile(".") }); Properties p = new Properties(); p.put("Export-Package", "test*;version=3.1"); b.setProperties(p); @@ -695,7 +695,7 @@ */ public void testPreProcess() throws Exception { Properties base = new Properties(); - base.put(Analyzer.INCLUDE_RESOURCE, "{src/test/top.mf} "); + base.put(Analyzer.INCLUDE_RESOURCE, "{" + getFile("test/top.mf") + "} "); Builder analyzer = new Builder(); analyzer.setProperties(base); analyzer.build(); @@ -709,7 +709,7 @@ public void testFindPathInBundleClasspath() throws Exception { Properties base = new Properties(); - base.put(Analyzer.INCLUDE_RESOURCE, "jar=jar"); + base.put(Analyzer.INCLUDE_RESOURCE, "jar=" + getFile("jar")); base.put(Analyzer.BUNDLE_CLASSPATH, "${findpath;jar/.{1,4}\\.jar}"); Builder analyzer = new Builder(); analyzer.setProperties(base); @@ -801,7 +801,7 @@ p.put("Bundle-Activator", "test.activator.Activator"); p.put("Private-Package", "test.*"); bmaker.setProperties(p); - bmaker.setClasspath(new File[] { new File("bin") }); + bmaker.setClasspath(new File[] { getFile(".") }); Jar jar = bmaker.build(); report("testFindActivator", bmaker, jar); assertEquals(0, bmaker.getErrors().size()); @@ -859,10 +859,10 @@ p.put("Export-Package", "test.activator;-split-package:=merge-first"); p.put("Bundle-Activator", "test.activator.Activator"); p.put("Import-Package", "*"); - p.put("Include-Resource", "ds.jar=jar/ds.jar"); + p.put("Include-Resource", "ds.jar=" + getFile("jar/ds.jar")); p.put("Bundle-ClassPath", ".,ds.jar"); bmaker.setProperties(p); - bmaker.setClasspath(new File[] { new File("bin"), new File("src") }); + bmaker.setClasspath(new File[] { getFile("."), new File("src") }); Jar jar = bmaker.build(); report("testBundleClasspath3", bmaker, jar); assertEquals(0, bmaker.getErrors().size()); @@ -881,10 +881,10 @@ p.put("Bundle-Activator", "org.eclipse.equinox.ds.Activator"); p.put("Private-Package", "test.activator;-split-package:=merge-first"); p.put("Import-Package", "*"); - p.put("Include-Resource", "ds.jar=jar/ds.jar"); + p.put("Include-Resource", "ds.jar=" + getFile("jar/ds.jar")); p.put("Bundle-ClassPath", ".,ds.jar"); bmaker.setProperties(p); - bmaker.setClasspath(new File[] { new File("bin"), new File("src") }); + bmaker.setClasspath(new File[] { getFile("."), new File("src") }); Jar jar = bmaker.build(); report("testBundleClasspath2", bmaker, jar); assertEquals(bmaker.getErrors().size(), 0); @@ -899,7 +899,7 @@ p.put("Import-Package", "*"); p.put("Bundle-ClassPath", "."); bmaker.setProperties(p); - bmaker.setClasspath(new File[] { new File("bin"), new File("src") }); + bmaker.setClasspath(new File[] { getFile("."), new File("src") }); Jar jar = bmaker.build(); report("testBundleClasspath", bmaker, jar); jar.exists("test/activator/Activator.class"); @@ -911,7 +911,7 @@ Builder bmaker = new Builder(); Properties p = new Properties(); - p.put("-classpath", "jar/mina.jar"); + p.put("-classpath", getFile("jar/mina.jar")); p.put("Export-Package", "!META-INF.*,*"); p.put("Import-Package", "org.apache.commons.collections.map,*"); bmaker.setProperties(p); @@ -924,7 +924,7 @@ Builder bmaker = new Builder(); Properties p = new Properties(); - p.put("-classpath", "jar/ro.jar"); + p.put("-classpath", getFile("jar/ro.jar").toString()); p.put("Export-Package", "*"); p.put("Import-Package", ""); bmaker.setProperties(p); @@ -942,7 +942,7 @@ public void testClasspathFileNotExist() throws Exception { Builder bmaker = new Builder(); Properties p = new Properties(); - File cp[] = new File[] { getFile("jar/idonotexist.jar") }; + File cp[] = new File[] { new File("jar/idonotexist.jar") }; bmaker.setProperties(p); bmaker.setClasspath(cp); @@ -985,7 +985,7 @@ public void testIncludeResourceResourcesOnly() throws Exception { Builder bmaker = new Builder(); Properties p = new Properties(); - File cp[] = new File[] { new File("src") }; + File cp[] = new File[] { getFile(".") }; p.put("Import-Package", ""); p.put("Private-Package", "test.resourcesonly"); @@ -1001,7 +1001,7 @@ public void testIncludeResourceFromZipDefault() throws Exception { Builder bmaker = new Builder(); Properties p = new Properties(); - p.put("Include-Resource", &quot;(a)jar/easymock.jar&quot;); + p.put("Include-Resource", "@" + getFile("jar/easymock.jar")); bmaker.setProperties(p); Jar jar = bmaker.build(); @@ -1014,7 +1014,7 @@ public void testIncludeResourceFromZipDeep() throws Exception { Builder bmaker = new Builder(); Properties p = new Properties(); - p.put("Include-Resource", &quot;(a)jar/easymock.jar!/**&quot;); + p.put("Include-Resource", "@" + getFile("jar/easymock.jar") + "!/**"); bmaker.setProperties(p); Jar jar = bmaker.build(); @@ -1028,7 +1028,7 @@ Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Import-Package", "!*"); - p.put("Include-Resource", &quot;(a)jar/easymock.jar!/org/easymock/**&quot;); + p.put("Include-Resource", "@" + getFile("jar/easymock.jar") + "!/org/easymock/**"); bmaker.setProperties(p); Jar jar = bmaker.build(); assertEquals(1, bmaker.getWarnings().size()); @@ -1040,7 +1040,7 @@ Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Import-Package", "!*"); - p.put("Include-Resource", &quot;(a)jar/easymock.jar!/org/easymock/**&quot;); + p.put("Include-Resource", "@" + getFile("jar/easymock.jar") + "!/org/easymock/**"); bmaker.setProperties(p); Jar jar = bmaker.build(); @@ -1053,7 +1053,7 @@ Builder bmaker = new Builder(); Properties p = new Properties(); p.put("Import-Package", ""); - p.put("Include-Resource", &quot;(a)jar/osgi.jar!/LICENSE&quot;); + p.put("Include-Resource", "@" + getFile("jar/osgi.jar") + "!/LICENSE"); bmaker.setProperties(p); Jar jar = bmaker.build(); assertEquals(1, jar.getResources().size()); @@ -1096,7 +1096,7 @@ public void testSimple() throws Exception { File cp[] = { new File("src"), getFile("jar/asm.jar") }; Builder bmaker = new Builder(); - bmaker.setProperties(new File("src/test/simple.mf")); + bmaker.setProperties(getFile("test/simple.mf")); bmaker.setClasspath(cp); Jar jar = bmaker.build(); System.out.println(jar.getResources()); Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/ClassParserTest.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/ClassParserTest.java 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/ClassParserTest.java 2009-09-30 12:58:26 UTC (rev 94151) @@ -40,7 +40,7 @@ public void testWeirdClass() throws Exception { Builder b = new Builder(); b.setProperty("Private-Package", "crap"); - b.addClasspath(getFile("test/craptest")); + b.addClasspath(getFile(".")); Jar j = b.build(); System.out.println(b.getWarnings()); assertEquals(0, b.getErrors().size()); Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/activator/Activator.java =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/activator/Activator.java (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/java/test/activator/Activator.java 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,13 @@ +package test.activator; + +import org.osgi.framework.*; + +public class Activator implements BundleActivator { + + public void start(BundleContext context) throws Exception { + } + + public void stop(BundleContext context) throws Exception { + } + +} Copied: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/crap (from rev 94150, projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/craptest/crap) Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/bcel.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/bcel.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/easymock.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/easymock.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/mina.bar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/mina.bar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/mina.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/mina.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.bnd 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,4 @@ +-classpath: mina.jar +Import-Package: org.apache.commons.collections.map,* +Export-Package: !META-INF.*,* + Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.bnd ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/minax.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/ro.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/ro.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.bnd 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,4 @@ +-classpath: ro.jar +Export-Package: * +Import-Package: + Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.bnd ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/jar/rox.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/makesondemand.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/makesondemand.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/makesondemand.bnd 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,2 @@ +Include-Resource: ondemand.jar +-resourceonly: true Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/ondemand.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/ondemand.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/bnd/ondemand.bnd 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1 @@ +Export-Package: aQute.bnd.main Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/bnd.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/bnd.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/bnd.bnd 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1 @@ +Export-Package: org.objectweb.asm Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/defaultbsn.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/defaultbsn.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/defaultbsn.bnd 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1 @@ +Export-Package: org.objectweb.asm Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/setsbsn.bnd =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/setsbsn.bnd (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/com.acme/setsbsn.bnd 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,3 @@ +Export-Package: org.objectweb.asm +Bundle-SymbolicName: is.a.set.bsn + Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/include.mf =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/include.mf (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/include.mf 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,4 @@ +Export-Package=aQute.bean;special=true, org.objectweb.asm.util, *xml2mif +Import-Package=* +Bundle-Includes=../../jar, simple.mf, @../../jar/thinlet.jar +Private-Package=aQute.lib.aim Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/include.mf ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/simple.mf =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/simple.mf (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/simple.mf 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,4 @@ +Export-Package=aQute.bean;special=true, org.objectweb.asm.util, *xml2mif +Import-Package=* +Bundle-Includes=../../jar, simple.mf, @../../jar/thinlet.jar +Private-Package=aQute.lib.aim Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/simple.mf ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/top.mf =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/top.mf (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/top.mf 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,5 @@ +-include=include.mf +Export-Package=aQute.bean;special=true, org.objectweb.asm.util, *xml2mif +Import-Package=* +Bundle-Includes=../../jar, simple.mf, @../../jar/thinlet.jar +Private-Package=aQute.lib.aim Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/top.mf ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/variables.mf =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/variables.mf (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/variables.mf 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,2 @@ +p=aQute.test +Header=${p} Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/resourcesonly/variables.mf ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/simple.mf =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/simple.mf (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/simple.mf 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,4 @@ +Export-Package=aQute.bean;special=true, org.objectweb.asm.util, *xml2mif +Import-Package=* +Bundle-Includes=../../jar, simple.mf, @../../jar/thinlet.jar +Private-Package=aQute.lib.aim Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/simple.mf ___________________________________________________________________ Name: svn:executable + * Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/tb1.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/tb1.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/test.jar =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/test.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/top.mf =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/top.mf (rev 0) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/top.mf 2009-09-30 12:58:26 UTC (rev 94151) @@ -0,0 +1,5 @@ +-include=include.mf +Export-Package=aQute.bean;special=true, org.objectweb.asm.util, *xml2mif +Import-Package=* +Bundle-Includes=../../jar, simple.mf, @../../jar/thinlet.jar +Private-Package=aQute.lib.aim Property changes on: projects/jboss-osgi/projects/aQute/trunk/aQute.bnd/src/test/resources/test/top.mf ___________________________________________________________________ Name: svn:executable + * Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.libg/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.libg/pom.xml 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.libg/pom.xml 2009-09-30 12:58:26 UTC (rev 94151) @@ -24,7 +24,7 @@ <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>aQute.parent</artifactId> + <artifactId>aQute</artifactId> <version>0.0.366-SNAPSHOT</version> </parent> Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.runtime/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.runtime/pom.xml 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.runtime/pom.xml 2009-09-30 12:58:26 UTC (rev 94151) @@ -24,7 +24,7 @@ <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>aQute.parent</artifactId> + <artifactId>aQute</artifactId> <version>0.0.366-SNAPSHOT</version> </parent> Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.service/.classpath =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.service/.classpath 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.service/.classpath 2009-09-30 12:58:26 UTC (rev 94151) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/aQute/trunk/aQute.service/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/aQute.service/pom.xml 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/aQute.service/pom.xml 2009-09-30 12:58:26 UTC (rev 94151) @@ -24,7 +24,7 @@ <!-- Parent --> <parent> <groupId>biz.aQute</groupId> - <artifactId>aQute.parent</artifactId> + <artifactId>aQute</artifactId> <version>0.0.366-SNAPSHOT</version> </parent> Modified: projects/jboss-osgi/projects/aQute/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/aQute/trunk/pom.xml 2009-09-30 11:46:44 UTC (rev 94150) +++ projects/jboss-osgi/projects/aQute/trunk/pom.xml 2009-09-30 12:58:26 UTC (rev 94151) @@ -18,7 +18,7 @@ <description>A utility and plugin to wrap, build, or print bundles</description> <groupId>biz.aQute</groupId> - <artifactId>aQute.parent</artifactId> + <artifactId>aQute</artifactId> <packaging>pom</packaging> <version>0.0.366-SNAPSHOT</version> @@ -32,10 +32,10 @@ <!-- Modules --> <modules> - <module>runtime</module> - <module>libg</module> - <module>service</module> - <module>bnd</module> + <module>aQute.runtime</module> + <module>aQute.libg</module> + <module>aQute.service</module> + <module>aQute.bnd</module> </modules> <!-- DependencyManagement -->