July 2009 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r91152 - projects/jboss-osgi/projects/bundles/husky/trunk/harness.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:27:33 -0400 (Mon, 13 Jul 2009) New Revision: 91152 Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/.project Log: Rename eclipse project Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/.project =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/harness/.project 2009-07-13 11:22:41 UTC (rev 91151) +++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/.project 2009-07-13 11:27:33 UTC (rev 91152) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-husky-harness</name> + <name>jboss-osgi-husky</name> <comment></comment> <projects> </projects>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91151 - projects/jboss-osgi/projects/bundles/jmx/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:22:41 -0400 (Mon, 13 Jul 2009) New Revision: 91151 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml Log: Add explicit dependency on common-core Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-13 11:16:48 UTC (rev 91150) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-13 11:22:41 UTC (rev 91151) @@ -18,18 +18,23 @@  <properties> + <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi> <version.osgi>r4v41</version.osgi> </properties>  <dependencies> - <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jndi</artifactId> <version>${version.jboss.osgi.jndi}</version> </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common-core</artifactId> + <version>${version.jboss.osgi.common.core}</version> + </dependency>  <dependency>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91150 - projects/jboss-osgi/projects/integration/deployers/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:16:48 -0400 (Mon, 13 Jul 2009) New Revision: 91150 Modified: projects/jboss-osgi/projects/integration/deployers/trunk/pom.xml Log: Add explicit dependency on deployers Modified: projects/jboss-osgi/projects/integration/deployers/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/integration/deployers/trunk/pom.xml 2009-07-13 11:04:58 UTC (rev 91149) +++ projects/jboss-osgi/projects/integration/deployers/trunk/pom.xml 2009-07-13 11:16:48 UTC (rev 91150) @@ -17,13 +17,19 @@ </parent> <properties> + <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>r4v41</version.osgi> </properties> - +  <dependencies> <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91149 - projects/jboss-osgi/projects/spi/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:04:58 -0400 (Mon, 13 Jul 2009) New Revision: 91149 Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml Log: Make dependency on MC as scope provided Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) +++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-13 11:04:58 UTC (rev 91149) @@ -42,11 +42,6 @@ <version>${version.jboss.logging}</version> </dependency> <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss.deployers}</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${version.junit}</version> @@ -67,6 +62,12 @@ </dependency> <dependency> <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>${version.jboss.deployers}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-client-spi</artifactId> <version>${version.jboss.deployers}</version> <scope>provided</scope>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91148 - in projects/jboss-osgi/trunk: blueprint and 7 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:04:27 -0400 (Mon, 13 Jul 2009) New Revision: 91148 Removed: projects/jboss-osgi/trunk/blueprint/.classpath projects/jboss-osgi/trunk/blueprint/.project projects/jboss-osgi/trunk/blueprint/.settings/ projects/jboss-osgi/trunk/blueprint/impl/ projects/jboss-osgi/trunk/blueprint/pom.xml projects/jboss-osgi/trunk/blueprint/src/ projects/jboss-osgi/trunk/blueprint/testsuite/ projects/jboss-osgi/trunk/husky/.classpath projects/jboss-osgi/trunk/husky/.project projects/jboss-osgi/trunk/husky/.settings/ projects/jboss-osgi/trunk/husky/harness/.classpath projects/jboss-osgi/trunk/husky/harness/.project projects/jboss-osgi/trunk/husky/harness/.settings/ projects/jboss-osgi/trunk/husky/harness/pom.xml projects/jboss-osgi/trunk/husky/harness/src/ projects/jboss-osgi/trunk/husky/pom.xml projects/jboss-osgi/trunk/husky/src/ projects/jboss-osgi/trunk/husky/testsuite/.classpath projects/jboss-osgi/trunk/husky/testsuite/.project projects/jboss-osgi/trunk/husky/testsuite/.settings/ projects/jboss-osgi/trunk/husky/testsuite/pom.xml projects/jboss-osgi/trunk/husky/testsuite/scripts/ projects/jboss-osgi/trunk/husky/testsuite/src/ Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml Log: Extract blueprint and husky Deleted: projects/jboss-osgi/trunk/blueprint/.classpath =================================================================== --- projects/jboss-osgi/trunk/blueprint/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/blueprint/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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"/> -</classpath> Deleted: projects/jboss-osgi/trunk/blueprint/.project =================================================================== --- projects/jboss-osgi/trunk/blueprint/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/blueprint/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-blueprint</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,77 +0,0 @@ -<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 Blueprint</name> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint-parent</artifactId> - <packaging>pom</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta3</version> - </parent> - -  - <modules> - <module>impl</module> - <module>testsuite</module> - </modules> - -  - <profiles> - -  - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>framework</name> - <value>knopflerfish</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - -</project> Deleted: projects/jboss-osgi/trunk/husky/.classpath =================================================================== --- projects/jboss-osgi/trunk/husky/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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"/> -</classpath> Deleted: projects/jboss-osgi/trunk/husky/.project =================================================================== --- projects/jboss-osgi/trunk/husky/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-husky</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/husky/harness/.classpath =================================================================== --- projects/jboss-osgi/trunk/husky/harness/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/harness/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <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"/> -</classpath> Deleted: projects/jboss-osgi/trunk/husky/harness/.project =================================================================== --- projects/jboss-osgi/trunk/husky/harness/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/harness/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-husky-harness</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  -  -  -  -  -  -  -  - -  - -<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 Husky - Harness</name> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - <packaging>bundle</packaging> - -  - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - -  - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - </dependency> - -  - <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> - </dependencies> - - <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.husky.runtime.osgi.HuskyActivator</Bundle-Activator> - <Private-Package> - org.jboss.osgi.husky.internal, - org.jboss.osgi.husky.runtime*, - </Private-Package> - <Export-Package> - org.jboss.osgi.husky;version=${version}, - org.jboss.osgi.husky.annotation;version=${version} - </Export-Package> - <Embed-Transitive>true</Embed-Transitive> - <Embed-Dependency> - junit;inline=false, - </Embed-Dependency> - <_exportcontents>org.junit;version=${version.junit}</_exportcontents> - </instructions> - </configuration> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <excludePackageNames>*.internal</excludePackageNames> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> Deleted: projects/jboss-osgi/trunk/husky/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  -  -  -  -  -  -  -  - -  - -<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 Husky</name> - <description>JBoss OSGi Test Support</description> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <packaging>pom</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta3</version> - </parent> - -  - <properties> - </properties> - -  - <modules> - <module>harness</module> - <module>testsuite</module> - </modules> - -  - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${version.junit}</version> - </dependency> - -  - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>${version.apache.felix.log}</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.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> - </dependencies> - </dependencyManagement> -</project> Deleted: projects/jboss-osgi/trunk/husky/testsuite/.classpath =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/testsuite/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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"/> -</classpath> Deleted: projects/jboss-osgi/trunk/husky/testsuite/.project =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/testsuite/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-husky-testsuite</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/husky/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  -  -  -  -  -  -  -  - -  - -<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 Husky - Testsuite</name> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-testsuite</artifactId> - <packaging>jar</packaging> - -  - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - -  - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </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>jboss-osgi-common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <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> - </plugins> - </build> - -  - <profiles> - -  - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>framework</name> - <value>knopflerfish</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - -</project> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,8 +18,6 @@  <modules> - <module>husky</module> - <module>blueprint</module> <module>testsuite</module> </modules> @@ -153,7 +151,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <version>${version.jboss.osgi.husky}</version> </dependency> <dependency> @@ -325,224 +323,6 @@ </profile>  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <profile> - <id>embedded-testing</id> - <activation> - <property> - <name>!target.container</name> - </property> - </activation> - <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>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> - -  - <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> - <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> - -  Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,7 +18,7 @@ <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,7 +18,7 @@ <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -78,7 +78,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,7 +18,7 @@ <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91147 - in projects/jboss-osgi/projects/bundles: blueprint and 3 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:02:40 -0400 (Mon, 13 Jul 2009) New Revision: 91147 Added: projects/jboss-osgi/projects/bundles/blueprint/ projects/jboss-osgi/projects/bundles/blueprint/trunk/ Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml Log: Extract blueprint Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk (from rev 91144, projects/jboss-osgi/trunk/blueprint) Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) @@ -11,67 +11,79 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta3</version> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> +  + <properties> + <version.apache.felix.log>1.0.0</version.apache.felix.log> + <version.jboss.logging>2.0.5.GA</version.jboss.logging> + <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> + <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky> + <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> + <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> + <version.osgi>r4v41</version.osgi> + </properties> +  <modules> <module>impl</module> <module>testsuite</module> </modules> +  + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + <version>${version.jboss.logging}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-husky</artifactId> + <version>${version.jboss.osgi.husky}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-microcontainer</artifactId> + <version>${version.jboss.osgi.microcontainer}</version> + </dependency> + +  + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${version.apache.felix.log}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common-core</artifactId> + <version>${version.jboss.osgi.common.core}</version> + </dependency> + +  + <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> + </dependencies> + </dependencyManagement> +  <profiles> - -  - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>framework</name> - <value>knopflerfish</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) @@ -18,13 +18,9 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint</artifactId> + <version>${version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>biz.aQute</groupId> @@ -33,22 +29,12 @@ <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> - <scope>test</scope> </dependency> - -  - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </dependency>  <dependency> @@ -63,10 +49,19 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> - + +  + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> </dependencies>  @@ -116,77 +111,6 @@  <profiles> - -  - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>framework</name> - <value>knopflerfish</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  </profiles> </project> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) @@ -19,7 +19,7 @@ <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-microcontainer:jar</include>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91146 - in projects/jboss-osgi/projects/bundles: husky and 5 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 06:27:10 -0400 (Mon, 13 Jul 2009) New Revision: 91146 Added: projects/jboss-osgi/projects/bundles/husky/ projects/jboss-osgi/projects/bundles/husky/trunk/ Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml Log: Extract Husky Copied: projects/jboss-osgi/projects/bundles/husky/trunk (from rev 91144, projects/jboss-osgi/trunk/husky) Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-07-13 10:27:10 UTC (rev 91146) @@ -18,13 +18,13 @@ <name>JBossOSGi Husky - Harness</name> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <packaging>bundle</packaging>  <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> + <artifactId>jboss-osgi-husky-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java =================================================================== --- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java 2009-07-13 10:27:10 UTC (rev 91146) @@ -49,6 +49,6 @@ super("org.jboss.osgi.husky.runtime.Connector"); addDependency(new JMXCapability()); - addBundle("bundles/jboss-osgi-husky-harness.jar"); + addBundle("bundles/jboss-osgi-husky.jar"); } } \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-07-13 10:27:10 UTC (rev 91146) @@ -19,19 +19,24 @@ <description>JBoss OSGi Test Support</description> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> + <artifactId>jboss-osgi-husky-parent</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta3</version> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent>  <properties> + <version.apache.felix.log>1.0.0</version.apache.felix.log> + <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> + <version.junit>4.6</version.junit> + <version.osgi>r4v41</version.osgi> </properties>  @@ -62,11 +67,6 @@ </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> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-07-13 10:27:10 UTC (rev 91146) @@ -24,7 +24,7 @@  <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> + <artifactId>jboss-osgi-husky-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -32,11 +32,8 @@ <dependencies> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> + <version>${version}</version> <scope>provided</scope> </dependency> @@ -65,11 +62,6 @@ </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> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml 2009-07-13 10:27:10 UTC (rev 91146) @@ -17,7 +17,7 @@ <includes> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-jmx:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.osgi.compendium:jar</include> </includes>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91145 - projects/jboss-osgi/projects/parent/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 06:25:11 -0400 (Mon, 13 Jul 2009) New Revision: 91145 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml Log: Move testing profiles to parent Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-13 10:25:11 UTC (rev 91145) @@ -195,4 +195,228 @@ </plugins> </reporting> +  + <profiles> + +  + <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> + +  + <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> + +  + <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> + +  + <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> + +  + <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> + +  + <profile> + <id>embedded-testing</id> + <activation> + <property> + <name>!target.container</name> + </property> + </activation> + <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>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> + +  + <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>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91141 - in projects/jboss-osgi/trunk/hudson/hudson-home/jobs: JBoss-6.0.0 and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 02:49:52 -0400 (Mon, 13 Jul 2009) New Revision: 91141 Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml Log: Switch AS600 build to mvn install Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-07-13 06:45:23 UTC (rev 91140) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-07-13 06:49:52 UTC (rev 91141) @@ -25,7 +25,11 @@ <canRoam>true</canRoam> <disabled>false</disabled> <jdk>jdk1.5</jdk> - <triggers class="vector"/> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 0 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> <builders> <hudson.tasks.Shell> <command> Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-07-13 06:45:23 UTC (rev 91140) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-07-13 06:49:52 UTC (rev 91141) @@ -25,7 +25,11 @@ <canRoam>true</canRoam> <disabled>false</disabled> <jdk>jdk1.5</jdk> - <triggers class="vector"/> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 1 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> <builders> <hudson.tasks.Shell> <command> @@ -44,7 +48,7 @@ # Build JBoss # cd jbossas -build/build.sh clean main +build/build.sh clean install # # Start JBossAS

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91103 - projects/jboss-osgi/trunk/husky/testsuite/src/test/resources.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-10 11:41:30 -0400 (Fri, 10 Jul 2009) New Revision: 91103 Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties Log: Add missing spi.logging package Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-07-10 15:35:08 UTC (rev 91102) +++ projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-07-10 15:41:30 UTC (rev 91103) @@ -23,6 +23,7 @@ org.jboss.logging, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.logging;version=1.0, \ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ org.jboss.osgi.spi.testing;version=1.0, \

16 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits July 2009