Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #5264 - Fixing OSGi tests 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2020-09-23 17:56:58 -05:00
parent b56733915b
commit 32875aa564
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-osgi/test-jetty-osgi-fragment/pom.xml
View File

@ -49,7 +49,7 @@
<Bundle-SymbolicName>${bundle-symbolic-name}</Bundle-SymbolicName> <Bundle-SymbolicName>${bundle-symbolic-name}</Bundle-SymbolicName>
<Bundle-Name>Jetty OSGi Test WebApp Fragment</Bundle-Name> <Bundle-Name>Jetty OSGi Test WebApp Fragment</Bundle-Name>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Fragment-Host>org.eclipse.jetty.tests.test-spec-webapp</Fragment-Host> <Fragment-Host>org.eclipse.jetty.demos.demo-spec-webapp</Fragment-Host>
<Jetty-WarFragmentResourcePath>/</Jetty-WarFragmentResourcePath> <Jetty-WarFragmentResourcePath>/</Jetty-WarFragmentResourcePath>
</instructions> </instructions>
</configuration> </configuration>

2
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
View File

@ -89,7 +89,7 @@ public class TestJettyOSGiBootWithAnnotations
res.add(mavenBundle().groupId("org.eclipse.jetty.tests").artifactId("test-container-initializer").versionAsInProject()); res.add(mavenBundle().groupId("org.eclipse.jetty.tests").artifactId("test-container-initializer").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.jetty.tests").artifactId("test-mock-resources").versionAsInProject()); res.add(mavenBundle().groupId("org.eclipse.jetty.tests").artifactId("test-mock-resources").versionAsInProject());
//test webapp bundle //test webapp bundle
res.add(mavenBundle().groupId("org.eclipse.jetty.tests").artifactId("test-spec-webapp").classifier("webbundle").versionAsInProject()); res.add(mavenBundle().groupId("org.eclipse.jetty.demos").artifactId("demo-spec-webapp").classifier("webbundle").versionAsInProject());
return res; return res;
} }

2
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
View File

@ -101,7 +101,7 @@ public class TestJettyOSGiBootWithJavaxWebSocket
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.common"); startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.common");
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.client"); startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.client");
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.server"); startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.server");
startBundle(bundleContext, "org.eclipse.jetty.tests.webapp"); startBundle(bundleContext, "org.eclipse.jetty.demos.webapp");
if (Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG)) if (Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG))
TestOSGiUtil.diagnoseBundles(bundleContext); TestOSGiUtil.diagnoseBundles(bundleContext);