aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-07-29 08:12:17 (EDT)
committerSteve Powell2010-07-29 08:12:17 (EDT)
commite4fd15003ae3562f159b74798ba04d36dcd5f0ad (patch)
treec527c179824ee1fa508b38a0270a8ee24b40a48a
parent24107526b81c9bbc6842464a91e6675ca4d13fb7 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-e4fd15003ae3562f159b74798ba04d36dcd5f0ad.zip
org.eclipse.gemini.web.gemini-web-container-e4fd15003ae3562f159b74798ba04d36dcd5f0ad.tar.gz
org.eclipse.gemini.web.gemini-web-container-e4fd15003ae3562f159b74798ba04d36dcd5f0ad.tar.bz2
Eliminate warning and re-build MANIFEST (bundlor).
-rwxr-xr-xorg.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocator.java1
-rw-r--r--org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF37
2 files changed, 20 insertions, 18 deletions
diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocator.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocator.java
index 6e3da32..b5870e7 100755
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocator.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/WebappConfigLocator.java
@@ -131,6 +131,7 @@ public class WebappConfigLocator {
* configuration directory.
*
* @param mainConfigDir the main Tomcat's configuration directory
+ * @param host host
* @return the directory where the web applications' context.xml files are placed.
*/
public static File resolveWebappConfigDir(File mainConfigDir, Host host) {
diff --git a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
index 6fb1f3f..bfa0d0c 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.gemini.web.tomcat.spi;version="1";uses:="o
rg.osgi.framework"
Bundle-Version: 1
-Tool: Bundlor 1.0.0.M6
+Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Gemini Web Tomcat Bootstrap (incubation)
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemini.web.tomcat.internal.Activator
@@ -12,21 +12,22 @@ Import-Package: javax.management;version="0",javax.naming;version="0",
ache.catalina;version="6.0.20.S2-r5956",org.apache.catalina.connector
;version="6.0.20.S2-r5956",org.apache.catalina.core;version="6.0.20.S
2-r5956",org.apache.catalina.deploy;version="6.0.20.S2-r5956",org.apa
- che.catalina.startup;version="6.0.20.S2-r5956",org.apache.catalina.ut
- il;version="6.0.20.S2-r5956",org.apache.juli.logging;version="6.0.20.
- S2-r5956",org.apache.naming;version="6.0.20.S2-r5956",org.apache.nami
- ng.resources;version="6.0.20.S2-r5956",org.apache.tomcat;version="6.0
- .20.S2-r5956",org.apache.tomcat.util;version="6.0.20.S2-r5956",org.ap
- ache.tomcat.util.digester;version="6.0.20.S2-r5956",org.apache.tomcat
- .util.modeler;version="6.0.20.S2-r5956",org.eclipse.gemini.web.core;v
- ersion="1.0",org.eclipse.gemini.web.core.spi;version="1.0",org.eclips
- e.osgi.baseadaptor;version="0";resolution:="optional",org.eclipse.osg
- i.baseadaptor.bundlefile;version="0";resolution:="optional",org.eclip
- se.osgi.framework.adaptor;version="0";resolution:="optional",org.ecli
- pse.osgi.framework.internal.core;version="0";resolution:="optional",o
- rg.eclipse.virgo.util.io;version="2.0",org.eclipse.virgo.util.osgi;ve
- rsion="2.0",org.osgi.framework;version="0",org.osgi.service.packagead
- min;version="1.0",org.osgi.service.url;version="1.0",org.osgi.util.tr
- acker;version="1.4.0",org.slf4j;version="1.5.10",org.springframework.
- osgi.util;version="1.2.0",org.xml.sax;version="0"
+ che.catalina.session;version="6.0.20.S2-r5956",org.apache.catalina.st
+ artup;version="6.0.20.S2-r5956",org.apache.catalina.util;version="6.0
+ .20.S2-r5956",org.apache.juli.logging;version="6.0.20.S2-r5956",org.a
+ pache.naming;version="6.0.20.S2-r5956",org.apache.naming.resources;ve
+ rsion="6.0.20.S2-r5956",org.apache.tomcat;version="6.0.20.S2-r5956",o
+ rg.apache.tomcat.util;version="6.0.20.S2-r5956",org.apache.tomcat.uti
+ l.digester;version="6.0.20.S2-r5956",org.apache.tomcat.util.modeler;v
+ ersion="6.0.20.S2-r5956",org.eclipse.gemini.web.core;version="1.0",or
+ g.eclipse.gemini.web.core.spi;version="1.0",org.eclipse.osgi.baseadap
+ tor;version="0";resolution:="optional",org.eclipse.osgi.baseadaptor.b
+ undlefile;version="0";resolution:="optional",org.eclipse.osgi.framewo
+ rk.adaptor;version="0";resolution:="optional",org.eclipse.osgi.framew
+ ork.internal.core;version="0";resolution:="optional",org.eclipse.virg
+ o.util.io;version="2.0",org.eclipse.virgo.util.osgi;version="2.0",org
+ .osgi.framework;version="0",org.osgi.service.packageadmin;version="1.
+ 0",org.osgi.service.url;version="1.0",org.osgi.util.tracker;version="
+ 1.4.0",org.slf4j;version="1.5.10",org.springframework.osgi.util;versi
+ on="1.2.0",org.xml.sax;version="0"