[jboss-cvs] JBossAS SVN: r95288 - in projects/jboss-osgi/trunk: distribution and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 21 08:58:31 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-10-21 08:58:30 -0400 (Wed, 21 Oct 2009)
New Revision: 95288
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java
projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Replace pax-web-extender-war with jboss-osgi-webapp
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -218,8 +218,8 @@
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
<!-- web -->
+ <include name="jboss-osgi-webapp.jar" />
<include name="jboss-osgi-webconsole.jar" />
- <include name="pax-web-extender-war.jar" />
<include name="pax-web-jetty-bundle.jar" />
</fileset>
@@ -231,8 +231,8 @@
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
<!-- web -->
+ <include name="jboss-osgi-webapp.jar" />
<include name="jboss-osgi-webconsole.jar" />
- <include name="pax-web-extender-war.jar" />
<include name="pax-web-jetty-bundle.jar" />
<!-- all -->
<include name="jboss-osgi-apache-xerces.jar" />
@@ -374,9 +374,9 @@
<include name="jboss-osgi-jaxb.jar" />
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
+ <include name="jboss-osgi-webapp.jar" />
<include name="jboss-osgi-webconsole.jar" />
<include name="jboss-osgi-xml-binding.jar" />
- <include name="pax-web-extender-war.jar" />
<include name="pax-web-jetty-bundle.jar" />
<include name="org.apache.felix.log.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -15,6 +15,7 @@
<include>*:jboss-osgi-apache-xerces:jar:sources</include>
<include>*:jboss-osgi-blueprint:jar:sources</include>
<include>*:jboss-osgi-common:jar:sources</include>
+ <include>*:jboss-osgi-deployment:jar:sources</include>
<include>*:jboss-osgi-hotdeploy:jar:sources</include>
<include>*:jboss-osgi-husky:jar:sources</include>
<include>*:jboss-osgi-jaxb:jar:sources</include>
@@ -22,6 +23,7 @@
<include>*:jboss-osgi-jndi:jar:sources</include>
<include>*:jboss-osgi-microcontainer:jar:sources</include>
<include>*:jboss-osgi-spi:jar:sources</include>
+ <include>*:jboss-osgi-webapp:jar:sources</include>
<include>*:jboss-osgi-xml-binding:jar:sources</include>
</includes>
<unpack>true</unpack>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -247,6 +247,16 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
</dependency>
<dependency>
@@ -332,12 +342,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
+
+ <!-- OPS4J -->
<dependency>
<groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
</dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -70,7 +70,6 @@
<version.jboss.osgi.webapp>0.7.0-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
- <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base>
<version.ops4j.pax.web>0.7.0</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -230,21 +229,7 @@
<!-- OPS4J -->
<dependency>
- <!--
- [TODO] Invalid maven dependency on pax base
- http://issues.ops4j.org/browse/PAXWEB-177
- -->
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-util-xml</artifactId>
- <version>${version.ops4j.pax.base}</version>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- <version>${version.ops4j.pax.web}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
<version>${version.ops4j.pax.web}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/common/Deployment.java 2009-10-21 12:58:30 UTC (rev 95288)
@@ -57,6 +57,11 @@
public String getVersion();
/**
+ * Get the manifest header for the given key.
+ */
+ public String getManifestHeader(String key);
+
+ /**
* Get the start level associated with this deployment
*/
public int getStartLevel();
Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java 2009-10-21 12:58:30 UTC (rev 95288)
@@ -96,6 +96,14 @@
}
/**
+ * Get the manifest header for the given key.
+ */
+ public String getManifestHeader(String key)
+ {
+ return info.getManifestHeader(key);
+ }
+
+ /**
* Get the start level associated with this deployment
*/
public int getStartLevel()
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -237,6 +237,7 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
+ <exclude>org/jboss/test/osgi/example/webapp/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -30,7 +30,6 @@
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
- <include>*:pax-web-extender-war:jar</include>
<include>*:pax-web-jetty-bundle:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-21 12:58:30 UTC (rev 95288)
@@ -30,11 +30,11 @@
import java.io.InputStreamReader;
import java.net.URL;
-import org.jboss.osgi.spi.capability.WebAppCapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.jboss.osgi.webapp.WebAppCapability;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -96,13 +96,13 @@
{
try
{
+ Thread.sleep(200);
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
line = br.readLine();
}
catch (IOException ex)
{
lastException = ex;
- Thread.sleep(200);
}
}
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 12:56:10 UTC (rev 95287)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 12:58:30 UTC (rev 95288)
@@ -134,22 +134,12 @@
<scope>provided</scope>
</dependency>
- <!-- Ops4J -->
+ <!-- OPS4J -->
<dependency>
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-util-xml</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Test Dependencies -->
<dependency>
More information about the jboss-cvs-commits
mailing list