Author: thomas.diesler(a)jboss.com Date: 2009-07-14 03:49:04 -0400 (Tue, 14 Jul 2009) New Revision: 91189 Modified: projects/jboss-osgi/trunk/modules/bundles/apache-xerces/pom.xml projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/modules/bundles/common/pom.xml projects/jboss-osgi/trunk/modules/bundles/hotdeploy/pom.xml projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml projects/jboss-osgi/trunk/modules/bundles/jaxb/pom.xml projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/pom.xml projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/pom.xml projects/jboss-osgi/trunk/modules/bundles/jmx/pom.xml projects/jboss-osgi/trunk/modules/bundles/jndi/pom.xml projects/jboss-osgi/trunk/modules/bundles/microcontainer/pom.xml projects/jboss-osgi/trunk/modules/bundles/remotelog/pom.xml projects/jboss-osgi/trunk/modules/bundles/webconsole/pom.xml projects/jboss-osgi/trunk/modules/runtime/deployers/pom.xml projects/jboss-osgi/trunk/modules/runtime/equinox/pom.xml projects/jboss-osgi/trunk/modules/runtime/felix/pom.xml projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml projects/jboss-osgi/trunk/modules/runtime/knopflerfish/pom.xml projects/jboss-osgi/trunk/modules/spi/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Eclipse cannot handle versions defined in reactor pom Modified: projects/jboss-osgi/trunk/modules/bundles/apache-xerces/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/apache-xerces/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/apache-xerces/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -9,7 +9,7 @@ <artifactId>jboss-osgi-apache-xerces</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.apache.xerces}</version> + <version>2.9.1-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -11,7 +11,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-parent</artifactId> - <version>${version.jboss.osgi.blueprint}</version> + <version>1.0.0-SNAPSHOT</version> </parent> <!-- Dependencies --> Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -7,7 +7,7 @@ <artifactId>jboss-osgi-blueprint-parent</artifactId> <packaging>pom</packaging> - <version>${version.jboss.osgi.blueprint}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-parent</artifactId> - <version>${version.jboss.osgi.blueprint}</version> + <version>1.0.0-SNAPSHOT</version> </parent> <!-- Dependencies --> Modified: projects/jboss-osgi/trunk/modules/bundles/common/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/common/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/common/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-common</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.common}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/hotdeploy/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/hotdeploy/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/hotdeploy/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -9,7 +9,7 @@ <artifactId>jboss-osgi-hotdeploy</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.hotdeploy}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>${version.jboss.osgi.husky}</version> + <version>1.0.0-SNAPSHOT</version> </parent> <!-- Dependencies --> Modified: projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -22,7 +22,7 @@ <artifactId>jboss-osgi-husky-parent</artifactId> <packaging>pom</packaging> - <version>${version.jboss.osgi.husky}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>${version.jboss.osgi.husky}</version> + <version>1.0.0-SNAPSHOT</version> </parent> <!-- Dependencies --> Modified: projects/jboss-osgi/trunk/modules/bundles/jaxb/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/jaxb/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/jaxb/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -9,7 +9,7 @@ <artifactId>jboss-osgi-jaxb</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.jaxb}</version> + <version>2.1.10-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -9,7 +9,7 @@ <artifactId>jboss-osgi-common-core</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.common.core}</version> + <version>2.2.11-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -9,7 +9,7 @@ <artifactId>jboss-osgi-xml-binding</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.xml.binding}</version> + <version>2.0.1-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/jmx/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/jmx/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/jmx/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-jmx</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.jmx}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/jndi/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/jndi/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/jndi/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-jndi</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.jndi}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/microcontainer/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/microcontainer/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -9,7 +9,7 @@ <artifactId>jboss-osgi-microcontainer</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.microcontainer}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/remotelog/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/remotelog/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/remotelog/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -9,7 +9,7 @@ <artifactId>jboss-osgi-remotelog</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.remotelog}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/webconsole/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/bundles/webconsole/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/bundles/webconsole/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-webconsole</artifactId> <packaging>bundle</packaging> - <version>${version.jboss.osgi.webconsole}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/runtime/deployers/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/runtime/deployers/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/runtime/deployers/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-deployers</artifactId> <packaging>jar</packaging> - <version>${version.jboss.osgi.runtime.deployers}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/runtime/equinox/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/runtime/equinox/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-runtime-equinox</artifactId> <packaging>jar</packaging> - <version>${version.jboss.osgi.runtime.equinox}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/runtime/felix/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/runtime/felix/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-runtime-felix</artifactId> <packaging>jar</packaging> - <version>${version.jboss.osgi.runtime.felix}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-integration-jbossas</artifactId> <packaging>jar</packaging> - <version>${version.jboss.osgi.runtime.jbossas}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/runtime/knopflerfish/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/runtime/knopflerfish/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> <packaging>jar</packaging> - <version>${version.jboss.osgi.runtime.knopflerfis}</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/spi/pom.xml =================================================================== --- projects/jboss-osgi/trunk/modules/spi/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/modules/spi/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -8,7 +8,7 @@ <artifactId>jboss-osgi-spi</artifactId> <packaging>jar</packaging> - <version>${version.jboss.osgi.spi}</version> + <version>1.0.0-SNAPSHOT</version> <!-- Parent --> <parent> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-14 07:04:03 UTC (rev 91188) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-14 07:49:04 UTC (rev 91189) @@ -320,6 +320,225 @@ <module>modules/testsuite</module> </modules> </profile> + + <!-- + Name: no-jboss-bind-address + Desc: Set the default jboss.bind.address + --> + <profile> + <id>no-jboss-bind-address</id> + <activation> + <property> + <name>!jboss.bind.address</name> + </property> + </activation> + <properties> + <jboss.bind.address>localhost</jboss.bind.address> + </properties> + </profile> + + <!-- + Name: framework-default + Descr: Setup for default framework integration testing + --> + <profile> + <id>framework-default</id> + <activation> + <property> + <name>!framework</name> + </property> + </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> + </properties> + </profile> + + <!-- + Name: framework-felix + Descr: Setup for Felix framework integration testing + --> + <profile> + <id>framework-felix</id> + <activation> + <property> + <name>framework</name> + <value>felix</value> + </property> + </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> + </properties> + </profile> + + <!-- + Name: framework-equinox + Descr: Setup for Equinox framework integration testing + --> + <profile> + <id>framework-equinox</id> + <activation> + <property> + <name>framework</name> + <value>equinox</value> + </property> + </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties> + </properties> + </profile> + + <!-- + Name: framework-knopflerfish + Descr: Setup for Knopflerfish framework integration testing + --> + <profile> + <id>framework-knopflerfish</id> + <activation> + <property> + <name>framework</name> + <value>knopflerfish</value> + </property> + </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-knopflerfish.properties</jboss.osgi.framework.properties> + </properties> + </profile> + + <!-- + Name: embedded-testing + Descr: Setup for embedded integration testing + --> + <profile> + <id>embedded-testing</id> + <activation> + <property> + <name>!target.container</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <!-- + You can copy these properties in Eclipse to debug example tests + + -Djava.protocol.handler.pkgs=org.jboss.net.protocol|org.jboss.virtual.protocol + -Djndi.server.port=1199 + -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target} + -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeAwareParserConfiguration + -Djboss.osgi.framework.properties=jboss-osgi-felix.properties + -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker + -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs + --> + <property> + <name>java.protocol.handler.pkgs</name> + <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + </property> + <property> + <name>jndi.server.port</name> + <value>1199</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>jboss.osgi.framework.properties</name> + <value>${jboss.osgi.framework.properties}</value> + </property> + <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: remote-testing + Descr: Setup for remote integration testing + --> + <profile> + <id>remote-testing</id> + <activation> + <property> + <name>target.container</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <version>5.0.1.GA</version> + <scope>test</scope> + <type>pom</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.protocol.handler.pkgs</name> + <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + </property> + <property> + <name>jboss.bind.address</name> + <value>${jboss.bind.address}</value> + </property> + <property> + <name>jndi.server.port</name> + <value>1099</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name> + <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value> + </property> + <property> + <name>jboss.osgi.framework.properties</name> + <value>${jboss.osgi.framework.properties}</value> + </property> + <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <property> + <name>org.jboss.osgi.husky.runtime.connector.host</name> + <value>${jboss.bind.address}</value> + </property> + <property> + <name>org.jboss.osgi.husky.runtime.connector.port</name> + <value>5401</value> + </property> + <property> + <name>target.container</name> + <value>${target.container}</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>