JBoss-OSGI SVN: r89410 - projects/jboss-osgi/trunk/hudson/hudson-home.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 19:31:36 -0400 (Mon, 25 May 2009)
New Revision: 89410
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
Log:
Remove reference to build module
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-05-25 23:28:14 UTC (rev 89409)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-05-25 23:31:36 UTC (rev 89410)
@@ -8,8 +8,8 @@
JBOSS_SERVER=default
OSGIDIR=$WORKSPACE/jboss-osgi
-DISTRODIR=$OSGIDIR/build/distribution/target
-HUDSONDIR=$OSGIDIR/build/hudson
+DISTRODIR=$OSGIDIR/distribution/target
+HUDSONDIR=$OSGIDIR/hudson
HUDSONBIN=$HUDSONDIR/hudson-home/bin
case "$CONTAINER" in
17 years, 1 month
JBoss-OSGI SVN: r89409 - projects/jboss-osgi.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 19:28:14 -0400 (Mon, 25 May 2009)
New Revision: 89409
Added:
projects/jboss-osgi/trunk/
Log:
Include projects in top level build
Copied: projects/jboss-osgi/trunk (from rev 89408, projects/jboss-osgi/branches/tdiesler)
17 years, 1 month
JBoss-OSGI SVN: r89408 - projects/jboss-osgi.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 19:27:46 -0400 (Mon, 25 May 2009)
New Revision: 89408
Removed:
projects/jboss-osgi/projects/
Log:
Include projects in top level build
17 years, 1 month
JBoss-OSGI SVN: r89407 - projects/jboss-osgi.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 19:27:37 -0400 (Mon, 25 May 2009)
New Revision: 89407
Removed:
projects/jboss-osgi/trunk/
Log:
Include projects in top level build
17 years, 1 month
JBoss-OSGI SVN: r89406 - in projects/jboss-osgi/branches/tdiesler/hudson/hudson-home: jobs and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 19:26:19 -0400 (Mon, 25 May 2009)
New Revision: 89406
Removed:
projects/jboss-osgi/branches/tdiesler/hudson/hudson-home/jobs/jbossosgi-projects/
Modified:
projects/jboss-osgi/branches/tdiesler/hudson/hudson-home/config.xml
Log:
update hudson
Modified: projects/jboss-osgi/branches/tdiesler/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/hudson/hudson-home/config.xml 2009-05-25 23:20:06 UTC (rev 89405)
+++ projects/jboss-osgi/branches/tdiesler/hudson/hudson-home/config.xml 2009-05-25 23:26:19 UTC (rev 89406)
@@ -9,12 +9,12 @@
<table>
<tr align="left"><th>Bind Addr</th><td>@jboss.bind.address@</td></tr>
<tr align="left"><th>JavaDoc</th><td>
-<a href='job/jbossosgi-projects/ws/jboss-osgi/spi/trunk/target/apidocs/index.html'>SPI</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/spi/target/apidocs/index.html'>SPI</a>
</td></tr>
<tr align="left"><th>Userguide</th><td>
-<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>
-<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>
-<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>
</td></tr>
</table>
]]>
17 years, 1 month
JBoss-OSGI SVN: r89405 - in projects/jboss-osgi/branches/tdiesler: blueprint/testsuite/scripts and 16 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 19:20:06 -0400 (Mon, 25 May 2009)
New Revision: 89405
Added:
projects/jboss-osgi/branches/tdiesler/bundles/.project
projects/jboss-osgi/branches/tdiesler/bundles/.settings/
projects/jboss-osgi/branches/tdiesler/bundles/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/branches/tdiesler/integration/.project
projects/jboss-osgi/branches/tdiesler/integration/.settings/
projects/jboss-osgi/branches/tdiesler/integration/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/branches/tdiesler/repository/.settings/
projects/jboss-osgi/branches/tdiesler/repository/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/branches/tdiesler/testsuite/.settings/
projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml
projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml
projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml
projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml
projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java
projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java
projects/jboss-osgi/branches/tdiesler/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml
projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java
projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml
projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml
Log:
fix 3rd party bundle refs
Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -43,7 +43,7 @@
<!-- Bundle Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint-impl</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -139,7 +139,15 @@
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<failIfNoTests>false</failIfNoTests>
<systemProperties>
+ <!--
+ 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>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
<value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
</property>
@@ -147,22 +155,14 @@
<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>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</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>
Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -15,14 +15,14 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:apache-xerces-bundle:jar</include>
+ <include>*:jboss-osgi-apache-xerces:jar</include>
<include>*:jboss-osgi-blueprint-impl: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-jmx:jar</include>
<include>*:jboss-osgi-logging:jar</include>
- <include>*:jboss-common-core-bundle:jar</include>
- <include>*:jbossxb-bundle:jar</include>
+ <include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.osgi.compendium:jar</include>
</includes>
Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-25 23:20:06 UTC (rev 89405)
@@ -32,8 +32,8 @@
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-common-core.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-apache-xerces.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-xml-binding.jar \
file://${test.archive.directory}/bundles/jboss-osgi-blueprint-impl.jar
\ No newline at end of file
Added: projects/jboss-osgi/branches/tdiesler/bundles/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/bundles/.project 2009-05-25 23:20:06 UTC (rev 89405)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-bundles</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/bundles/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/bundles/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405)
@@ -0,0 +1,9 @@
+#Tue May 26 00:51:34 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding-binding</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
<version>${version.jbossxb.bundle}</version>
</dependency>
Modified: projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -34,6 +34,13 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+
+ <!-- Bundle Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Provided Dependencies -->
<dependency>
Added: projects/jboss-osgi/branches/tdiesler/integration/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/integration/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/integration/.project 2009-05-25 23:20:06 UTC (rev 89405)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-integration</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/integration/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/branches/tdiesler/integration/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/integration/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405)
@@ -0,0 +1,9 @@
+#Tue May 26 00:51:34 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: projects/jboss-osgi/branches/tdiesler/repository/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/branches/tdiesler/repository/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/repository/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405)
@@ -0,0 +1,9 @@
+#Tue May 26 00:51:34 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java 2009-05-25 23:20:06 UTC (rev 89405)
@@ -41,7 +41,7 @@
props.setProperty("org.jboss.osgi.jndi.rmi.port", "1198");
props.setProperty("org.jboss.osgi.jndi.port", "1199");
- addBundle("bundles/jboss-common-core-bundle.jar");
+ addBundle("bundles/jboss-osgi-common-core.jar");
addBundle("bundles/jboss-osgi-jndi.jar");
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java 2009-05-25 23:20:06 UTC (rev 89405)
@@ -34,9 +34,9 @@
{
public MicrocontainerCapability()
{
- addBundle("bundles/apache-xerces-bundle.jar");
- addBundle("bundles/jaxb-bundle.jar");
- addBundle("bundles/jbossxb-bundle.jar");
+ addBundle("bundles/jboss-osgi-apache-xerces.jar");
+ addBundle("bundles/jboss-osgi-jaxb.jar");
+ addBundle("bundles/jboss-osgi-xml-binding.jar");
addBundle("bundles/jboss-osgi-microcontainer.jar");
}
}
\ No newline at end of file
Added: projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405)
@@ -0,0 +1,9 @@
+#Tue May 26 00:51:34 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/example/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/example/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -15,16 +15,16 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:apache-xerces-bundle:jar</include>
- <include>*:jaxb-bundle:jar</include>
- <include>*:jboss-common-core-bundle:jar</include>
+ <include>*:jboss-osgi-apache-xerces:jar</include>
<include>*:jboss-osgi-common:jar</include>
+ <include>*:jboss-osgi-common-core:jar</include>
+ <include>*:jboss-osgi-jaxb:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-remotelog:jar</include>
- <include>*:jbossxb-bundle:jar</include>
+ <include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -15,16 +15,16 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:apache-xerces-bundle:jar</include>
- <include>*:jaxb-bundle:jar</include>
- <include>*:jboss-common-core-bundle:jar</include>
+ <include>*:jboss-osgi-apache-xerces:jar</include>
<include>*:jboss-osgi-common:jar</include>
+ <include>*:jboss-osgi-common-core:jar</include>
+ <include>*:jboss-osgi-jaxb:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-remotelog:jar</include>
- <include>*:jbossxb-bundle:jar</include>
+ <include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java 2009-05-25 23:20:06 UTC (rev 89405)
@@ -47,7 +47,7 @@
OSGiRuntime runtime = getEmbeddedRuntime();
try
{
- AbstractBundle bundle = runtime.installBundle("bundles/apache-xerces-bundle.jar");
+ AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-apache-xerces.jar");
bundle.start();
assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
@@ -64,7 +64,7 @@
OSGiRuntime runtime = getEmbeddedRuntime();
try
{
- AbstractBundle bundle = runtime.installBundle("bundles/jaxb-bundle.jar");
+ AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-jaxb.jar");
bundle.start();
assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
@@ -81,8 +81,8 @@
OSGiRuntime runtime = getEmbeddedRuntime();
try
{
- AbstractBundle bundle = runtime.installBundle("bundles/apache-xerces-bundle.jar");
- bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar");
+ AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-apache-xerces.jar");
+ bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar");
bundle.start();
assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
@@ -99,10 +99,10 @@
OSGiRuntime runtime = getEmbeddedRuntime();
try
{
- AbstractBundle bundle = runtime.installBundle("bundles/apache-xerces-bundle.jar");
- bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar");
- bundle = runtime.installBundle("bundles/jaxb-bundle.jar");
- bundle = runtime.installBundle("bundles/jbossxb-bundle.jar");
+ AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-apache-xerces.jar");
+ bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar");
+ bundle = runtime.installBundle("bundles/jboss-osgi-jaxb.jar");
+ bundle = runtime.installBundle("bundles/jboss-osgi-xml-binding.jar");
bundle.start();
assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
@@ -119,7 +119,7 @@
OSGiRuntime runtime = getEmbeddedRuntime();
try
{
- AbstractBundle bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar");
+ AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar");
bundle = runtime.installBundle("bundles/jboss-osgi-jndi.jar");
bundle.start();
@@ -137,7 +137,7 @@
OSGiRuntime runtime = getEmbeddedRuntime();
try
{
- AbstractBundle bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar");
+ AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar");
bundle = runtime.installBundle("bundles/jboss-osgi-jndi.jar");
bundle = runtime.installBundle("bundles/jboss-osgi-jmx.jar");
bundle.start();
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -147,10 +147,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <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
@@ -160,14 +156,22 @@
<value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
</property>
<property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
+ <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>
+ <property>
<name>log4j.output.dir</name>
- <value>${basedir}/target</value>
+ <value>${project.build.directory}</value>
</property>
<property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ <property>
<name>jboss.osgi.framework.config</name>
<value>jboss-osgi-felix.properties</value>
</property>
@@ -202,10 +206,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <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
@@ -215,14 +215,22 @@
<value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
</property>
<property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
+ <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>
+ <property>
<name>log4j.output.dir</name>
- <value>${basedir}/target</value>
+ <value>${project.build.directory}</value>
</property>
<property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ <property>
<name>jboss.osgi.framework.config</name>
<value>jboss-osgi-felix.properties</value>
</property>
@@ -258,26 +266,14 @@
<configuration>
<systemProperties>
<property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ <name>log4j.output.dir</name>
+ <value>${basedir}/target</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>${basedir}/target</value>
- </property>
- <property>
<name>jboss.osgi.framework.config</name>
<value>jboss-osgi-equinox.properties</value>
</property>
@@ -317,14 +313,14 @@
<configuration>
<systemProperties>
<property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- <property>
<name>log4j.output.dir</name>
<value>${basedir}/target</value>
</property>
<property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ <property>
<name>jboss.osgi.framework.config</name>
<value>jboss-osgi-knopflerfish.properties</value>
</property>
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405)
@@ -15,16 +15,16 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:apache-xerces-bundle:jar</include>
- <include>*:jaxb-bundle:jar</include>
- <include>*:jboss-common-core-bundle:jar</include>
+ <include>*:jboss-osgi-apache-xerces:jar</include>
<include>*:jboss-osgi-common:jar</include>
+ <include>*:jboss-osgi-common-core:jar</include>
+ <include>*:jboss-osgi-jaxb:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-remotelog:jar</include>
- <include>*:jbossxb-bundle:jar</include>
+ <include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
17 years, 1 month
JBoss-OSGI SVN: r89404 - in projects/jboss-osgi/branches/tdiesler: 3rdparty/apache-xerces and 17 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 18:52:06 -0400 (Mon, 25 May 2009)
New Revision: 89404
Added:
projects/jboss-osgi/branches/tdiesler/blueprint/
projects/jboss-osgi/branches/tdiesler/docbook/.project
projects/jboss-osgi/branches/tdiesler/docbook/.settings/
projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/branches/tdiesler/runtime/.project
projects/jboss-osgi/branches/tdiesler/runtime/.settings/
projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/
projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs
Removed:
projects/jboss-osgi/branches/tdiesler/bundles/blueprint/
Modified:
projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml
projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml
projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml
projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml
projects/jboss-osgi/branches/tdiesler/blueprint/impl/pom.xml
projects/jboss-osgi/branches/tdiesler/blueprint/pom.xml
projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/pom.xml
projects/jboss-osgi/branches/tdiesler/distribution/pom.xml
projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml
projects/jboss-osgi/branches/tdiesler/pom.xml
projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml
Log:
Promote blueprint
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -4,7 +4,7 @@
<name>JBossOSGi 3rd Party - Apache Xerces</name>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
<packaging>bundle</packaging>
<version>2.9.1-SNAPSHOT</version>
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -4,7 +4,7 @@
<name>JBossOSGi 3rd Party - JAXB</name>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jaxb-bundle</artifactId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
<packaging>bundle</packaging>
<version>2.1.10-SNAPSHOT</version>
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -4,7 +4,7 @@
<name>JBossOSGi 3rd Party - JBoss Common Core</name>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-common-core-bundle</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
<packaging>bundle</packaging>
<version>2.2.11-SNAPSHOT</version>
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -4,7 +4,7 @@
<name>JBossOSGi 3rd Party - JBoss XML Binding</name>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jbossxb-bundle</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
<packaging>bundle</packaging>
<version>2.0.0-SNAPSHOT</version>
Copied: projects/jboss-osgi/branches/tdiesler/blueprint (from rev 89401, projects/jboss-osgi/branches/tdiesler/bundles/blueprint)
Modified: projects/jboss-osgi/branches/tdiesler/blueprint/impl/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/blueprint/impl/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
+++ projects/jboss-osgi/branches/tdiesler/blueprint/impl/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -1,14 +1,14 @@
<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>
+ <name>JBossOSGi Blueprint - Implementation</name>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint-impl</artifactId>
<packaging>bundle</packaging>
<parent>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jbossxb-bundle</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
<scope>provided</scope>
</dependency>
Modified: projects/jboss-osgi/branches/tdiesler/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
+++ projects/jboss-osgi/branches/tdiesler/blueprint/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -1,17 +1,17 @@
<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</name>
+ <name>JBossOSGi Blueprint</name>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<parent>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
<version>1.0.0.Beta2</version>
</parent>
@@ -65,7 +65,7 @@
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
<version>${version.apache.xerces.bundle}</version>
</dependency>
<dependency>
@@ -90,12 +90,12 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jbossxb-bundle</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
<version>${version.jbossxb.bundle}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-common-core-bundle</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
<version>${version.jboss.common.core.bundle}</version>
</dependency>
Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/blueprint/testsuite/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
+++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -1,14 +1,14 @@
<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>
+ <name>JBossOSGi Blueprint - Testsuite</name>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint-testsuite</artifactId>
<packaging>jar</packaging>
<parent>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -80,12 +80,12 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jbossxb-bundle</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-common-core-bundle</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
<scope>provided</scope>
</dependency>
Modified: projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -66,12 +66,12 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
<version>${version.apache.xerces.bundle}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jbossxb-bundle</artifactId>
+ <artifactId>jboss-osgi-xml-binding-binding</artifactId>
<version>${version.jbossxb.bundle}</version>
</dependency>
Modified: projects/jboss-osgi/branches/tdiesler/bundles/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/bundles/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -20,7 +20,6 @@
<modules>
<!-- jboss-osgi -->
<module>common</module>
- <module>blueprint</module>
<module>logging</module>
<module>jmx</module>
<module>jndi</module>
Modified: projects/jboss-osgi/branches/tdiesler/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/distribution/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/distribution/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -87,19 +87,19 @@
<!-- Bundles -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-common-core-bundle</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jaxb-bundle</artifactId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jbossxb-bundle</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
Added: projects/jboss-osgi/branches/tdiesler/docbook/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/docbook/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/docbook/.project 2009-05-25 22:52:06 UTC (rev 89404)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-userguide</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs 2009-05-25 22:52:06 UTC (rev 89404)
@@ -0,0 +1,9 @@
+#Tue May 26 00:30:31 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -35,13 +35,6 @@
<artifactId>junit</artifactId>
</dependency>
- <!-- Bundles -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
Modified: projects/jboss-osgi/branches/tdiesler/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -12,12 +12,13 @@
<!-- Modules -->
<modules>
<module>spi</module>
- <module>husky</module>
<module>3rdparty</module>
<module>runtime</module>
<module>integration</module>
<module>repository</module>
<module>bundles</module>
+ <module>husky</module>
+ <module>blueprint</module>
<module>testsuite</module>
</modules>
@@ -137,17 +138,17 @@
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
<version>${version.jboss.osgi.apache.xerces}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jaxb-bundle</artifactId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
<version>${version.jaxb.bundle}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-common-core-bundle</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
<version>${version.jboss.common.core.bundle}</version>
</dependency>
<dependency>
@@ -157,7 +158,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jbossxb-bundle</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
<version>${version.jboss.osgi.jbossxb}</version>
</dependency>
<dependency>
Added: projects/jboss-osgi/branches/tdiesler/runtime/.project
===================================================================
--- projects/jboss-osgi/branches/tdiesler/runtime/.project (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/runtime/.project 2009-05-25 22:52:06 UTC (rev 89404)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-runtime</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs 2009-05-25 22:52:06 UTC (rev 89404)
@@ -0,0 +1,9 @@
+#Tue May 26 00:30:31 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs 2009-05-25 22:52:06 UTC (rev 89404)
@@ -0,0 +1,9 @@
+#Tue May 26 00:30:31 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404)
@@ -59,12 +59,12 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jaxb-bundle</artifactId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-common-core-bundle</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
17 years, 1 month
JBoss-OSGI SVN: r89403 - projects/jboss-osgi/branches/tdiesler.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 18:23:32 -0400 (Mon, 25 May 2009)
New Revision: 89403
Added:
projects/jboss-osgi/branches/tdiesler/distribution/
projects/jboss-osgi/branches/tdiesler/docbook/
projects/jboss-osgi/branches/tdiesler/eclipse/
projects/jboss-osgi/branches/tdiesler/hudson/
Removed:
projects/jboss-osgi/branches/tdiesler/build/
Modified:
projects/jboss-osgi/branches/tdiesler/pom.xml
Log:
Migrate more to top-level
Copied: projects/jboss-osgi/branches/tdiesler/distribution (from rev 89400, projects/jboss-osgi/branches/tdiesler/build/distribution)
Copied: projects/jboss-osgi/branches/tdiesler/docbook (from rev 89400, projects/jboss-osgi/branches/tdiesler/build/docbook)
Copied: projects/jboss-osgi/branches/tdiesler/eclipse (from rev 89400, projects/jboss-osgi/branches/tdiesler/build/eclipse)
Copied: projects/jboss-osgi/branches/tdiesler/hudson (from rev 89400, projects/jboss-osgi/branches/tdiesler/build/hudson)
Modified: projects/jboss-osgi/branches/tdiesler/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:21:56 UTC (rev 89402)
+++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:23:32 UTC (rev 89403)
@@ -483,8 +483,8 @@
<profile>
<id>distro</id>
<modules>
- <module>build/distribution</module>
- <module>build/docbook</module>
+ <module>distribution</module>
+ <module>docbook</module>
</modules>
<build>
<plugins>
17 years, 1 month
JBoss-OSGI SVN: r89402 - projects/jboss-osgi/branches/tdiesler/bundles.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 18:21:56 -0400 (Mon, 25 May 2009)
New Revision: 89402
Modified:
projects/jboss-osgi/branches/tdiesler/bundles/
Log:
Migrate more to top-level
Property changes on: projects/jboss-osgi/branches/tdiesler/bundles
___________________________________________________________________
Name: svn:ignore
+ target
17 years, 1 month
JBoss-OSGI SVN: r89401 - in projects/jboss-osgi/branches/tdiesler: 3rdparty and 22 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 18:21:30 -0400 (Mon, 25 May 2009)
New Revision: 89401
Added:
projects/jboss-osgi/branches/tdiesler/bundles/
projects/jboss-osgi/branches/tdiesler/bundles/blueprint/
projects/jboss-osgi/branches/tdiesler/bundles/common/
projects/jboss-osgi/branches/tdiesler/bundles/jmx/
projects/jboss-osgi/branches/tdiesler/bundles/jndi/
projects/jboss-osgi/branches/tdiesler/bundles/logging/
projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/
projects/jboss-osgi/branches/tdiesler/bundles/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/remotelog/
projects/jboss-osgi/branches/tdiesler/bundles/webconsole/
projects/jboss-osgi/branches/tdiesler/integration/deployers/
Removed:
projects/jboss-osgi/branches/tdiesler/deployers/
projects/jboss-osgi/branches/tdiesler/projects/
Modified:
projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml
projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml
projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml
projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml
projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/common/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/jmx/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/jndi/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/logging/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/remotelog/pom.xml
projects/jboss-osgi/branches/tdiesler/bundles/webconsole/pom.xml
projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml
projects/jboss-osgi/branches/tdiesler/husky/pom.xml
projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml
projects/jboss-osgi/branches/tdiesler/integration/
projects/jboss-osgi/branches/tdiesler/integration/deployers/pom.xml
projects/jboss-osgi/branches/tdiesler/integration/pom.xml
projects/jboss-osgi/branches/tdiesler/pom.xml
projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml
projects/jboss-osgi/branches/tdiesler/repository/pom.xml
projects/jboss-osgi/branches/tdiesler/runtime/
projects/jboss-osgi/branches/tdiesler/spi/pom.xml
Log:
Migrate more to top-level
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -11,8 +11,8 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-osgi-3rdparty</artifactId>
+ <version>1.0.0.Beta2</version>
</parent>
<properties>
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -11,8 +11,8 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-osgi-3rdparty</artifactId>
+ <version>1.0.0.Beta2</version>
</parent>
<properties>
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -11,8 +11,8 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-osgi-3rdparty</artifactId>
+ <version>1.0.0.Beta2</version>
</parent>
<properties>
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -11,8 +11,8 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-osgi-3rdparty</artifactId>
+ <version>1.0.0.Beta2</version>
</parent>
<properties>
Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBossOSGi 3rd Party</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-3rdparty</artifactId>
<packaging>pom</packaging>
Copied: projects/jboss-osgi/branches/tdiesler/bundles/blueprint (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/blueprint/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Modules -->
Copied: projects/jboss-osgi/branches/tdiesler/bundles/common (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/common/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/common/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/common/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/common/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Copied: projects/jboss-osgi/branches/tdiesler/bundles/jmx (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/jmx/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/jmx/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/jmx/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/jmx/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Copied: projects/jboss-osgi/branches/tdiesler/bundles/jndi (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/jndi/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/jndi/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/jndi/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/jndi/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Copied: projects/jboss-osgi/branches/tdiesler/bundles/logging (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/logging/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/logging/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/logging/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/logging/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -8,11 +8,13 @@
<artifactId>jboss-osgi-logging</artifactId>
<packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Copied: projects/jboss-osgi/branches/tdiesler/bundles/microcontainer (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/microcontainer/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/microcontainer/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Copied: projects/jboss-osgi/branches/tdiesler/bundles/pom.xml (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml)
===================================================================
--- projects/jboss-osgi/branches/tdiesler/bundles/pom.xml (rev 0)
+++ projects/jboss-osgi/branches/tdiesler/bundles/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -0,0 +1,33 @@
+<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</name>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-bundles</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
+ <version>1.0.0.Beta2</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ </properties>
+
+ <!-- Modules -->
+ <modules>
+ <!-- jboss-osgi -->
+ <module>common</module>
+ <module>blueprint</module>
+ <module>logging</module>
+ <module>jmx</module>
+ <module>jndi</module>
+ <module>microcontainer</module>
+ <module>remotelog</module>
+ <module>webconsole</module>
+
+ </modules>
+
+</project>
Copied: projects/jboss-osgi/branches/tdiesler/bundles/remotelog (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/remotelog/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/remotelog/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/remotelog/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Copied: projects/jboss-osgi/branches/tdiesler/bundles/webconsole (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/webconsole/trunk)
Modified: projects/jboss-osgi/branches/tdiesler/bundles/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/projects/bundles/webconsole/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/bundles/webconsole/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Beta2</version>
</parent>
<!-- Properties -->
Modified: projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Project - Husky Harness</name>
+ <name>JBossOSGi Husky - Harness</name>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky-harness</artifactId>
Modified: projects/jboss-osgi/branches/tdiesler/husky/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/husky/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/husky/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Project - Husky</name>
+ <name>JBossOSGi Husky</name>
<description>JBoss OSGi Bundle Testsuite</description>
<groupId>org.jboss.osgi</groupId>
Modified: projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Project - Husky Testsuite</name>
+ <name>JBossOSGi Husky - Testsuite</name>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-husky-testsuite</artifactId>
Property changes on: projects/jboss-osgi/branches/tdiesler/integration
___________________________________________________________________
Name: svn:ignore
+ target
Copied: projects/jboss-osgi/branches/tdiesler/integration/deployers (from rev 89400, projects/jboss-osgi/branches/tdiesler/deployers)
Modified: projects/jboss-osgi/branches/tdiesler/integration/deployers/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/deployers/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/integration/deployers/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -2,7 +2,7 @@
<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 Project - Deployers</name>
+ <name>JBossOSGi Integration - Deployers</name>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
+ <artifactId>jboss-osgi-integration</artifactId>
<version>1.0.0.Beta2</version>
</parent>
Modified: projects/jboss-osgi/branches/tdiesler/integration/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/integration/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/integration/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -16,6 +16,7 @@
<!-- Modules -->
<modules>
+ <module>deployers</module>
<module>jbossas</module>
</modules>
Modified: projects/jboss-osgi/branches/tdiesler/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -13,12 +13,11 @@
<modules>
<module>spi</module>
<module>husky</module>
- <module>projects</module>
<module>3rdparty</module>
<module>runtime</module>
<module>integration</module>
<module>repository</module>
- <module>deployers</module>
+ <module>bundles</module>
<module>testsuite</module>
</modules>
Modified: projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -1,7 +1,7 @@
<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 Project - Repository API</name>
+ <name>JBossOSGi Repository - API</name>
<artifactId>jboss-osgi-repository-api</artifactId>
<packaging>jar</packaging>
Modified: projects/jboss-osgi/branches/tdiesler/repository/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/repository/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/repository/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -1,7 +1,7 @@
<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 Project - Repository</name>
+ <name>JBossOSGi Repository</name>
<artifactId>jboss-osgi-repository</artifactId>
<packaging>pom</packaging>
Modified: projects/jboss-osgi/branches/tdiesler/spi/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/spi/pom.xml 2009-05-25 21:50:30 UTC (rev 89400)
+++ projects/jboss-osgi/branches/tdiesler/spi/pom.xml 2009-05-25 22:21:30 UTC (rev 89401)
@@ -2,7 +2,7 @@
<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 Project - SPI</name>
+ <name>JBossOSGi SPI</name>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
17 years, 1 month