[jboss-osgi-commits] JBoss-OSGI SVN: r89352 - in projects/jboss-osgi/projects/bundles: blueprint/trunk/impl and 10 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-25 03:49:59 -0400 (Mon, 25 May 2009) New Revision: 89352 Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/ Removed: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/test/ projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/main/ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/resources/context/META-INF/ Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath projects/jboss-osgi/projects/bundles/blueprint/trunk/.project projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/resources/context/context-basic.bnd projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/projects/bundles/jbossxb/trunk/.classpath projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml Log: Add blueprint integration test module Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath 2009-05-25 06:53:31 UTC (rev 89351) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/.classpath 2009-05-25 07:49:59 UTC (rev 89352) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/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 kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/.project =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/.project 2009-05-25 06:53:31 UTC (rev 89351) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/.project 2009-05-25 07:49:59 UTC (rev 89352) @@ -6,8 +6,13 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>full,incremental,</triggers> <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> + </dictionary> </arguments> </buildCommand> <buildCommand> Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml (from rev 89261, projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml (rev 0) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml 2009-05-25 07:49:59 UTC (rev 89352) @@ -0,0 +1,83 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBossOSGi Bundles - Blueprint Impl</name> + + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint-impl</artifactId> + <packaging>bundle</packaging> + + <parent> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + </dependency> + + <!-- Provided Dependencies --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Bundle Dependencies --> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jbossxb-bundle</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + <!-- Build --> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> + <Bundle-Activator>org.jboss.osgi.blueprint.extender.BlueprintActivator</Bundle-Activator> + <Private-Package> + org.jboss.osgi.blueprint.* + </Private-Package> + <Export-Package> + org.osgi.service.blueprint.* + </Export-Package> + <Import-Package> + org.jboss.osgi.spi, + org.jboss.osgi.common.log, + org.jboss.xb.*, + org.osgi.framework, + org.osgi.service.log, + org.w3c.dom, + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <!-- Profiles --> + <profiles> + </profiles> + +</project> Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src (from rev 89260, projects/jboss-osgi/projects/bundles/blueprint/trunk/src) Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src ___________________________________________________________________ Name: svn:mergeinfo + Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java 2009-05-21 20:43:31 UTC (rev 89260) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java 2009-05-25 07:49:59 UTC (rev 89352) @@ -25,6 +25,7 @@ import java.net.URL; +import org.jboss.osgi.blueprint.BlueprintException; import org.jboss.osgi.blueprint.reflect.Blueprint; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java 2009-05-21 20:43:31 UTC (rev 89260) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/reflect/Blueprint.java 2009-05-25 07:49:59 UTC (rev 89352) @@ -31,6 +31,8 @@ import javax.xml.namespace.QName; +import org.jboss.osgi.spi.NotImplementedException; + /** * The blueprint element is the top element. The definitions consist of two sections: * the type-converter section and the components section. @@ -240,4 +242,13 @@ { return otherAttributes; } + + // Merge this Blueprint meta data with the given other, which may be null. + public Blueprint merge(Blueprint other) + { + if (other == null) + return this; + + throw new NotImplementedException("Blueprint metadata merge not yet implemented"); + } } Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 06:53:31 UTC (rev 89351) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 07:49:59 UTC (rev 89352) @@ -5,169 +5,107 @@ <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-blueprint</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> + <version>1.0.0-SNAPSHOT</version> + <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <!-- Modules --> + <modules> + <module>impl</module> + <module>testsuite</module> + </modules> + <!-- Properties --> <properties> + <version.apache.xerces.bundle>2.9.1-SNAPSHOT</version.apache.xerces.bundle> <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging> <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle> <version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle> <version.osgi>r4v41</version.osgi> </properties> <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + <version>${version.aqute.bnd}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + </dependency> - <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - </dependency> - <!-- Provided Dependencies --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> + <!-- OSGi Dependencies --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + </dependency> - <!-- Bundle Dependencies --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - <version>${version.jboss.osgi.husky}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-logging</artifactId> - <version>${version.jboss.osgi.logging}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> - <version>${version.jbossxb.bundle}</version> - <scope>provided</scope> - </dependency> + <!-- Bundle Dependencies --> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>apache-xerces-bundle</artifactId> + <version>${version.apache.xerces.bundle}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-husky-harness</artifactId> + <version>${version.jboss.osgi.husky}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-logging</artifactId> + <version>${version.jboss.osgi.logging}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jbossxb-bundle</artifactId> + <version>${version.jbossxb.bundle}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-common-core-bundle</artifactId> + <version>${version.jboss.common.core.bundle}</version> + </dependency> - <!-- Test Dependencies --> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> - <scope>test</scope> - </dependency> - </dependencies> + <!-- Test Dependencies --> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> + </dependency> + </dependencies> + </dependencyManagement> - <!-- Build --> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>bundles</id> - <phase>test-compile</phase> - <goals> - <goal>directory-single</goal> - </goals> - <configuration> - <finalName>test-libs</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-bundles.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-test-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="tests.output.dir" value="${project.build.directory}" /> - <ant antfile="scripts/antrun-test-jars.xml" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <excludePackageNames>org.jboss.*</excludePackageNames> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <!-- Exclude tests that require remote access --> - <exclude>**/junit4osgi/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - - <!-- Profiles --> - <profiles> - </profiles> - </project> Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml (from rev 89261, projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml (rev 0) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml 2009-05-25 07:49:59 UTC (rev 89352) @@ -0,0 +1,176 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBossOSGi Bundles - Blueprint Testsuite</name> + + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint-testsuite</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-husky-harness</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> + + <!-- Bundle Dependencies --> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint-impl</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>apache-xerces-bundle</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-husky-harness</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-logging</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jbossxb-bundle</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-common-core-bundle</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + <!-- Build --> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bundles</id> + <phase>test-compile</phase> + <goals> + <goal>directory-single</goal> + </goals> + <configuration> + <finalName>test-libs</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-bundles.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-test-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="tests.output.dir" value="${project.build.directory}" /> + <ant antfile="scripts/antrun-test-jars.xml" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>false</redirectTestOutputToFile> + <failIfNoTests>false</failIfNoTests> + <systemProperties> + <property> + <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name> + <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value> + </property> + <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <!-- + Implement URLStreamHandlerService + https://jira.jboss.org/jira/browse/JBOSGI-75 + --> + <property> + <name>java.protocol.handler.pkgs</name> + <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + + <!-- Profiles --> + <profiles> + </profiles> + +</project> Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts (from rev 89260, projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts) Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts ___________________________________________________________________ Name: svn:mergeinfo + Deleted: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2009-05-21 20:43:31 UTC (rev 89260) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml 2009-05-25 07:49:59 UTC (rev 89352) @@ -1,32 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <!-- Dependency Sets --> - <dependencySets> - - <!-- bundle --> - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>*:jboss-osgi-common:jar</include> - <include>*:jboss-osgi-jmx:jar</include> - <include>*:jboss-osgi-husky:jar</include> - <include>*:jboss-osgi-logging:jar</include> - <include>*:jbossxb-bundle:jar</include> - <include>*:org.apache.felix.log:jar</include> - <include>*:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - - </dependencySets> -</assembly> Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml (from rev 89261, projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml) =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml (rev 0) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml 2009-05-25 07:49:59 UTC (rev 89352) @@ -0,0 +1,35 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- bundle --> + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>*:apache-xerces-bundle:jar</include> + <include>*:jboss-osgi-blueprint-impl:jar</include> + <include>*:jboss-osgi-common:jar</include> + <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-jmx:jar</include> + <include>*:jboss-osgi-logging:jar</include> + <include>*:jboss-common-core-bundle:jar</include> + <include>*:jbossxb-bundle:jar</include> + <include>*:org.apache.felix.log:jar</include> + <include>*:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src (from rev 89260, projects/jboss-osgi/projects/bundles/blueprint/trunk/src) Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src ___________________________________________________________________ Name: svn:mergeinfo + Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/resources/context/context-basic.bnd =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/context/context-basic.bnd 2009-05-21 20:43:31 UTC (rev 89260) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/resources/context/context-basic.bnd 2009-05-25 07:49:59 UTC (rev 89352) @@ -1,9 +1,18 @@ # bnd build -classpath target/test-classes -output target/test-libs/context-basic.jar src/test/resources/context/context-basic.bnd Bundle-SymbolicName: context-basic + Export-Package: org.jboss.test.osgi.blueprint.context -Import-Package: org.jboss.osgi.husky, org.jboss.osgi.husky.annotation, org.jboss.osgi.spi.testing, org.junit, org.osgi.framework -Include-Resource: META-INF/blueprint=META-INF/blueprint +Import-Package: \ + org.jboss.osgi.husky, \ + org.jboss.osgi.husky.annotation, \ + org.jboss.osgi.spi.testing, \ + org.junit, \ + org.osgi.framework, \ + org.osgi.service.blueprint.* +Include-Resource: \ + OSGI-INF/blueprint=OSGI-INF/blueprint + Test-Package: org.jboss.test.osgi.blueprint.context Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/resources/jboss-osgi-framework.properties 2009-05-21 20:43:31 UTC (rev 89260) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-25 07:49:59 UTC (rev 89352) @@ -8,7 +8,7 @@ org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration # Properties to configure the Framework -org.osgi.framework.storage=${basedir}/target/osgi-store +org.osgi.framework.storage=${test.archive.directory}/../osgi-store org.osgi.framework.storage.clean=onFirstInit # Framework bootdelegation @@ -29,4 +29,11 @@ org.jboss.osgi.spi.framework.autoStart=\ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \ - file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \ No newline at end of file + file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-husky-harness.jar \ + file://${test.archive.directory}/bundles/jboss-common-core-bundle.jar \ + file://${test.archive.directory}/bundles/apache-xerces-bundle.jar \ + file://${test.archive.directory}/bundles/jbossxb-bundle.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-blueprint-impl.jar + \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jbossxb/trunk/.classpath 2009-05-25 06:53:31 UTC (rev 89351) +++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/.classpath 2009-05-25 07:49:59 UTC (rev 89352) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 06:53:31 UTC (rev 89351) +++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 07:49:59 UTC (rev 89352) @@ -18,6 +18,7 @@ <properties> <version.jboss.xb>2.0.0.GA</version.jboss.xb> <version.javasisst>3.9.0.GA</version.javasisst> + <version.osgi>r4v41</version.osgi> </properties> <dependencies> @@ -31,6 +32,14 @@ <artifactId>javassist</artifactId> <version>${version.javasisst}</version> </dependency> + + <!-- Provided Dependencies --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> @@ -41,6 +50,7 @@ <configuration> <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> + <Bundle-Activator>org.jboss.osgi.jbossxb.internal.Activator</Bundle-Activator> <Embed-Transitive>true</Embed-Transitive> <Import-Package> <!-- system --> @@ -66,7 +76,9 @@ jbossxb;inline=false, jboss-reflect;inline=false, </Embed-Dependency> - <_exportcontents>*</_exportcontents> + <_exportcontents> + org.jboss.xb.binding*;version=${version.jboss.xb} + </_exportcontents> </instructions> </configuration> </plugin>