Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix JavaEEIntegrationTestCase for latest AS7

  • Loading branch information...
commit b8bfee066e21416adc80d4af3b6f50166d9168bd 1 parent 8587d20
@tdiesler tdiesler authored
View
2  pom.xml
@@ -59,7 +59,7 @@
<version.jboss.osgi.deployment>1.1.1.Final</version.jboss.osgi.deployment>
<version.jboss.osgi.equinox>3.5.2.SP1</version.jboss.osgi.equinox>
<version.jboss.osgi.felix>3.0.4</version.jboss.osgi.felix>
- <version.jboss.osgi.framework>2.0.0.CR12</version.jboss.osgi.framework>
+ <version.jboss.osgi.framework>2.0.0.CR13</version.jboss.osgi.framework>
<version.jboss.osgi.jmx>1.1.0.Final</version.jboss.osgi.jmx>
<version.jboss.osgi.logging>1.0.0</version.jboss.osgi.logging>
<version.jboss.osgi.metadata>2.1.1.CR7</version.jboss.osgi.metadata>
View
14 ...ample/src/test/java/org/jboss/test/osgi/example/jbossas/ee/JavaEEIntegrationTestCase.java
@@ -46,7 +46,6 @@
import org.jboss.test.osgi.example.jbossas.ee.service.PaymentActivator;
import org.jboss.test.osgi.example.jbossas.ee.webapp.SimpleBeanClientServlet;
import org.jboss.test.osgi.example.jbossas.ee.webapp.SimpleClientServlet;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.osgi.framework.Bundle;
@@ -70,7 +69,6 @@
* @since 01-Feb-2012
*/
@RunWith(Arquillian.class)
-@Ignore
public class JavaEEIntegrationTestCase {
private static final String API_DEPLOYMENT_NAME = "example-javaee-api";
@@ -88,14 +86,6 @@
public static JavaArchive createdeployment() {
final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "example-javaee");
archive.addClasses(HttpSupport.class);
- archive.setManifest(new Asset() {
- @Override
- public InputStream openStream() {
- ManifestBuilder builder = ManifestBuilder.newInstance();
- builder.addManifestHeader("Dependencies", "org.osgi.core");
- return builder.openStream();
- }
- });
return archive;
}
@@ -175,7 +165,7 @@ public static JavaArchive getEjbArchive() {
public InputStream openStream() {
ManifestBuilder builder = ManifestBuilder.newInstance();
String osgidep = "org.osgi.core,org.jboss.osgi.framework";
- String apidep = ",deployment." + API_DEPLOYMENT_NAME + ":0.0.0";
+ String apidep = ",deployment." + API_DEPLOYMENT_NAME;
builder.addManifestHeader("Dependencies", osgidep + apidep);
return builder.openStream();
}
@@ -194,7 +184,7 @@ public static WebArchive getServletArchive() {
public InputStream openStream() {
ManifestBuilder builder = ManifestBuilder.newInstance();
String osgidep = "org.osgi.core,org.jboss.osgi.framework";
- String apidep = ",deployment." + API_DEPLOYMENT_NAME + ":0.0.0";
+ String apidep = ",deployment." + API_DEPLOYMENT_NAME;
String ejbdep = ",deployment." + EJB3_DEPLOYMENT_NAME;
builder.addManifestHeader("Dependencies", osgidep + apidep + ejbdep);
return builder.openStream();
Please sign in to comment.
Something went wrong with that request. Please try again.