[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-commit] r3040 - in jetty/trunk/jetty-osgi: jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp jetty-osgi-boot-jsp jetty-osgi-boot-jsp/META-INF

Author: hmalphett
Date: 2011-04-28 02:11:10 -0400 (Thu, 28 Apr 2011)
New Revision: 3040

Modified:
   jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
   jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
   jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
Log:
quick workaround for the regression in the jetty-osgi testunit

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java	2011-04-28 06:10:13 UTC (rev 3039)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java	2011-04-28 06:11:10 UTC (rev 3040)
@@ -284,7 +284,8 @@
             }
             else
             {
-                context.setBaseResource(Resource.newResource(baseWebappInstallURL));
+                //context.setBaseResource(Resource.newResource(baseWebappInstallURL));
+                context.setWar(baseWebappInstallURL.toString());
             }
             context.setContextPath(contextPath);
             context.setExtraClasspath(extraClasspath);

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF	2011-04-28 06:10:13 UTC (rev 3039)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF	2011-04-28 06:11:10 UTC (rev 3040)
@@ -2,34 +2,35 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Jetty-OSGi-Jasper integration
 Fragment-Host: org.eclipse.jetty.osgi.boot
-Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp;singleton:=true
-Bundle-Version: 7.3.0.qualifier
+Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: Mort Bay Consulting
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.sun.el;resolution:=optional,
  com.sun.el.lang;resolution:=optional,
  com.sun.el.parser;resolution:=optional,
  com.sun.el.util;resolution:=optional,
+ com.sun.org.apache.commons.logging;split=glassfish;version="[2.1,3)";resolution:=optional,
  javax.el;version="1.0.0";resolution:=optional,
+ javax.servlet;version="2.5.0",
  javax.servlet.jsp;version="2.1.0",
  javax.servlet.jsp.el;version="2.1.0",
  javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional,
  javax.servlet.jsp.jstl.fmt;version="1.2.0";resolution:=optional,
  javax.servlet.jsp.jstl.sql;version="1.2.0";resolution:=optional,
  javax.servlet.jsp.jstl.tlv;version="1.2.0";resolution:=optional,
- javax.servlet.jsp.resources;version="2.1",
- javax.servlet.jsp.tagext;version="2.1",
+ javax.servlet.jsp.resources;version="2.1.0",
+ javax.servlet.jsp.tagext;version="2.1.0",
  javax.servlet.resources;version="2.5.0",
- com.sun.org.apache.commons.logging;version="[2.1,3)";split="glassfish";resolution:=optional,
- org.apache.jasper;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler;version="6.0.0";resolution:=optional,
- org.apache.jasper.compiler.tagplugin;version="6.0.0";resolution:=optional,
- org.apache.jasper.runtime;version="6.0.0";resolution:=optional,
- org.apache.jasper.security;version="6.0.0";resolution:=optional,
- org.apache.jasper.servlet;version="6.0.0";resolution:=optional,
- org.apache.jasper.tagplugins.jstl;version="6.0.0";resolution:=optional,
- org.apache.jasper.util;version="6.0.0";resolution:=optional,
- org.apache.jasper.xmlparser;version="6.0.0";resolution:=optional,
+ org.apache.jasper;version="2.0.0";resolution:=optional,
+ org.apache.jasper.compiler;version="2.0.0";resolution:=optional,
+ org.apache.jasper.compiler.tagplugin;version="2.0.0";resolution:=optional,
+ org.apache.jasper.runtime;version="2.0.0";resolution:=optional,
+ org.apache.jasper.security;version="2.0.0";resolution:=optional,
+ org.apache.jasper.servlet;version="2.0.0";resolution:=optional,
+ org.apache.jasper.tagplugins.jstl;version="2.0.0";resolution:=optional,
+ org.apache.jasper.util;version="2.0.0";resolution:=optional,
+ org.apache.jasper.xmlparser;version="2.0.0";resolution:=optional,
  org.apache.taglibs.standard;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.extra.spath;version="1.2.0";resolution:=optional,
  org.apache.taglibs.standard.functions;version="1.2.0";resolution:=optional,

Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
===================================================================
--- jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml	2011-04-28 06:10:13 UTC (rev 3039)
+++ jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml	2011-04-28 06:11:10 UTC (rev 3040)
@@ -55,7 +55,7 @@
             <phase>process-resources</phase>
             <configuration>
               <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.3.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
+                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.4.1.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
               </tasks>
             </configuration>
             <goals>