update the test-webapp web-bundle packaging to support the reference to QoSFilter and update the test project for jetty-osgi to load commons-codec in the OSGi runtime for the tests

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2279 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Hugues Malphettes 2010-09-15 18:36:53 +00:00
parent 3af3ddd0ff
commit a4b693a271
3 changed files with 8 additions and 2 deletions

View File

@ -126,6 +126,11 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

View File

@ -70,12 +70,13 @@ public class TestJettyOSGiBootWithJsp
PaxRunnerOptions.vmOption("-D" + OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS +
"=etc/jetty.xml;" + testrealm.getAbsolutePath()),
mavenBundle().groupId( "org.eclipse.jetty.osgi" ).artifactId( "jetty-osgi-boot" ).versionAsInProject(),
mavenBundle().groupId( "org.eclipse.jetty.osgi" ).artifactId( "jetty-osgi-boot" ).versionAsInProject(),
mavenBundle().groupId( "org.eclipse.jetty.osgi" ).artifactId( "jetty-osgi-boot-jsp" ).versionAsInProject(),
mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-websocket" ).versionAsInProject(),
mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-servlets" ).versionAsInProject(),
mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "test-jetty-webapp" ).classifier("webbundle").versionAsInProject(),
mavenBundle().groupId( "commons-codec" ).artifactId( "commons-codec" ).versionAsInProject(),
//the jsp bundles downloaded from eclipse orbit website and the ecj jar.
// CoreOptions.provision( PaxRunnerOptions.scanDir( "jasper" ) ),
CoreOptions.provision( PaxRunnerOptions.scanDir( "target/distribution/lib/jsp" ) )

View File

@ -76,7 +76,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName>
<Import-Package>javax.servlet,*</Import-Package>
<Import-Package>javax.servlet,org.eclipse.jetty.servlets,*</Import-Package>
<Export-Package>!com.acme*</Export-Package>
<!-- the test webapp is configured via a jetty xml file
in order to add the security handler. -->