[jboss-cvs] JBossAS SVN: r84945 - in projects/jboss-osgi/trunk: build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.5 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 2 05:45:25 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-03-02 05:45:25 -0500 (Mon, 02 Mar 2009)
New Revision: 84945
Modified:
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.5/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.6/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-Matrix/config.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
Log:
Publish javadocs in hudson
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.5/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.5/config.xml 2009-03-02 10:44:43 UTC (rev 84944)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.5/config.xml 2009-03-02 10:45:25 UTC (rev 84945)
@@ -42,7 +42,7 @@
OSGIDIR=$WORKSPACE/jboss-osgi
HUDSONDIR=$OSGIDIR/build/hudson
-export HUDSON_BASE=@hudson.base@
+export HUDSON_BASE=$HUDSON_HOME/..
export OSGI_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
@@ -58,6 +58,10 @@
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
+ <hudson.tasks.JavadocArchiver>
+ <javadocDir>jboss-osgi/runtime/spi/target/apidocs</javadocDir>
+ <keepAll>false</keepAll>
+ </hudson.tasks.JavadocArchiver>
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.6/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.6/config.xml 2009-03-02 10:44:43 UTC (rev 84944)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-JDK1.6/config.xml 2009-03-02 10:45:25 UTC (rev 84945)
@@ -42,7 +42,7 @@
OSGIDIR=$WORKSPACE/jboss-osgi
HUDSONDIR=$OSGIDIR/build/hudson
-export HUDSON_BASE=@hudson.base@
+export HUDSON_BASE=$HUDSON_HOME/..
export OSGI_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
@@ -58,6 +58,10 @@
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
+ <hudson.tasks.JavadocArchiver>
+ <javadocDir>jboss-osgi/runtime/spi/target/apidocs</javadocDir>
+ <keepAll>false</keepAll>
+ </hudson.tasks.JavadocArchiver>
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-Matrix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-Matrix/config.xml 2009-03-02 10:44:43 UTC (rev 84944)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-OSGi-Matrix/config.xml 2009-03-02 10:45:25 UTC (rev 84945)
@@ -54,7 +54,7 @@
export CONTAINER=$container
-export HUDSON_BASE=@hudson.base@
+export HUDSON_BASE=$HUDSON_HOME/..
export OSGI_VERSION=@version.id@
export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
@@ -70,6 +70,10 @@
</hudson.tasks.Shell>
</builders>
<publishers class="vector">
+ <hudson.tasks.JavadocArchiver>
+ <javadocDir>jboss-osgi/runtime/spi/target/apidocs</javadocDir>
+ <keepAll>false</keepAll>
+ </hudson.tasks.JavadocArchiver>
<hudson.tasks.junit.JUnitResultArchiver>
<testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-03-02 10:44:43 UTC (rev 84944)
+++ projects/jboss-osgi/trunk/pom.xml 2009-03-02 10:45:25 UTC (rev 84945)
@@ -327,10 +327,6 @@
</modules>
<build>
<plugins>
- <!--
- <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <quiet>true</quiet> </configuration> <executions> <execution>
- <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> </execution> </executions> </plugin>
- -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-03-02 10:44:43 UTC (rev 84944)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-03-02 10:45:25 UTC (rev 84945)
@@ -24,7 +24,6 @@
//$Id$
import org.jboss.deployers.client.spi.main.MainDeployer;
-import org.jboss.osgi.spi.framework.NamedInstanceProvider;
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.OSGiFramework;
@@ -41,54 +40,53 @@
{
public void testFrameworkBootstrap() throws Exception
{
- OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider();
- OSGiFramework framework = configProvider.getFramework();
+ OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
+ OSGiFramework framework = bootProvider.getFramework();
assertNotNull("Framework not null", framework);
-
+
Bundle bundle = framework.getSystemBundle();
assertEquals("BundleId == 0", 0, bundle.getBundleId());
assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName());
-
- NamedInstanceProvider attProvider = (NamedInstanceProvider)configProvider;
- MainDeployer mainDeployer = (MainDeployer)attProvider.getInstance("MainDeployer");
+
+ MainDeployer mainDeployer = bootProvider.getInstance("MainDeployer", MainDeployer.class);
assertNotNull("MainDeployer not null", mainDeployer);
}
- public void testGetConfigurationProvider() throws Exception
+ public void testGetBootstrapProvider() throws Exception
{
- OSGiBootstrapProvider cp1 = OSGiBootstrap.getBootstrapProvider();
- OSGiBootstrapProvider cp2 = OSGiBootstrap.getBootstrapProvider();
- assertNotSame("Multiple provider instances", cp1, cp2);
+ OSGiBootstrapProvider bp1 = OSGiBootstrap.getBootstrapProvider();
+ OSGiBootstrapProvider bp2 = OSGiBootstrap.getBootstrapProvider();
+ assertNotSame("Multiple provider instances", bp1, bp2);
}
public void testConfigureFromResource() throws Exception
{
- OSGiBootstrapProvider cp = OSGiBootstrap.getBootstrapProvider();
- cp.configure("bootstrap/mock-bootstrap-beans.xml");
-
- SomeBean bean = (SomeBean)cp.getInstance("SomeBean");
+ OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
+ bootProvider.configure("bootstrap/mock-bootstrap-beans.xml");
+
+ SomeBean bean = bootProvider.getInstance("SomeBean", SomeBean.class);
assertNotNull("Bean not null", bean);
-
- OSGiFramework framework = cp.getFramework();
+
+ OSGiFramework framework = bootProvider.getFramework();
assertNull("Framework null", framework);
-
- cp.configure("bootstrap/mock-osgi-beans.xml");
- assertNotNull("Framework not null", cp.getFramework());
+
+ bootProvider.configure("bootstrap/mock-osgi-beans.xml");
+ assertNotNull("Framework not null", bootProvider.getFramework());
}
public void testConfigureFromURL() throws Exception
{
- OSGiBootstrapProvider cp = OSGiBootstrap.getBootstrapProvider();
- cp.configure(getResourceURL("bootstrap/mock-bootstrap-beans.xml"));
-
- SomeBean bean = (SomeBean)cp.getInstance("SomeBean");
+ OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
+ bootProvider.configure(getResourceURL("bootstrap/mock-bootstrap-beans.xml"));
+
+ SomeBean bean = bootProvider.getInstance("SomeBean", SomeBean.class);
assertNotNull("Bean not null", bean);
-
- OSGiFramework framework = cp.getFramework();
+
+ OSGiFramework framework = bootProvider.getFramework();
assertNull("Framework null", framework);
-
- cp.configure(getResourceURL("bootstrap/mock-osgi-beans.xml"));
- assertNotNull("Framework not null", cp.getFramework());
+
+ bootProvider.configure(getResourceURL("bootstrap/mock-osgi-beans.xml"));
+ assertNotNull("Framework not null", bootProvider.getFramework());
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list