aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-11-03 12:16:18 (EDT)
committerGlyn Normington2010-11-03 12:16:18 (EDT)
commit739e10c045104bb97ae70694188d3c585de1b5e3 (patch)
tree3bfafdd84b52907994bafe2a3a4fd404c26fa81d
parent33eff9d131f9867772822823538c520823003853 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-739e10c045104bb97ae70694188d3c585de1b5e3.zip
org.eclipse.gemini.web.gemini-web-container-739e10c045104bb97ae70694188d3c585de1b5e3.tar.gz
org.eclipse.gemini.web.gemini-web-container-739e10c045104bb97ae70694188d3c585de1b5e3.tar.bz2
fix bundlor prefs
-rw-r--r--org.eclipse.gemini.web.core/.settings/com.springsource.server.ide.bundlor.core.prefs2
-rw-r--r--org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF22
-rw-r--r--org.eclipse.gemini.web.core/src/test/resources/META-INF/TEST.MF7
-rw-r--r--org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF2
6 files changed, 18 insertions, 19 deletions
diff --git a/org.eclipse.gemini.web.core/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.gemini.web.core/.settings/com.springsource.server.ide.bundlor.core.prefs
index 35eb0de..e75644b 100644
--- a/org.eclipse.gemini.web.core/.settings/com.springsource.server.ide.bundlor.core.prefs
+++ b/org.eclipse.gemini.web.core/.settings/com.springsource.server.ide.bundlor.core.prefs
@@ -1,3 +1,3 @@
#Wed Apr 15 15:27:27 BST 2009
-com.springsource.server.ide.bundlor.core.template.properties.files=template.properties\:build.properties
+com.springsource.server.ide.bundlor.core.template.properties.files=../build.properties;../build.versions
eclipse.preferences.version=1
diff --git a/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF
index 00dd3a3..ae52542 100644
--- a/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
Manifest-Version: 1
-Export-Package: org.eclipse.gemini.web.core;version="1.0";uses:="javax
- .servlet,org.eclipse.virgo.util.osgi.manifest,org.osgi.framework",org
- .eclipse.gemini.web.core.spi;version="1.0";uses:="javax.servlet,org.o
- sgi.framework",org.eclipse.gemini.web.internal.template;version="1.0"
- ;uses:="org.osgi.framework,org.osgi.util.tracker",org.eclipse.gemini.
- web.internal.url;version="1.0";uses:="org.eclipse.gemini.web.core,org
- .eclipse.virgo.util.io,org.eclipse.virgo.util.osgi.manifest,org.eclip
- se.virgo.util.osgi.manifest.parse,org.osgi.framework,org.osgi.service
- .url"
+Export-Package: org.eclipse.gemini.web.core;version="1.2.0";uses:="jav
+ ax.servlet,org.eclipse.virgo.util.osgi.manifest,org.osgi.framework",o
+ rg.eclipse.gemini.web.core.spi;version="1.2.0";uses:="javax.servlet,o
+ rg.osgi.framework",org.eclipse.gemini.web.internal.template;version="
+ 1.2.0";uses:="org.osgi.framework,org.osgi.util.tracker",org.eclipse.g
+ emini.web.internal.url;version="1.2.0";uses:="org.eclipse.gemini.web.
+ core,org.eclipse.virgo.util.io,org.eclipse.virgo.util.osgi.manifest,o
+ rg.eclipse.virgo.util.osgi.manifest.parse,org.osgi.framework,org.osgi
+ .service.url"
Bundle-Version: 1.0
-Tool: Bundlor 1.0.0.M6
+Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Gemini Web Core
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemini.web.internal.WebContainerActivato
@@ -21,5 +21,5 @@ Import-Package: javax.servlet;version="2.5",org.eclipse.virgo.util.io;
ifest.parse;version="2.0",org.osgi.framework;version="0",org.osgi.ser
vice.event;version="1.1";resolution:="optional",org.osgi.service.pack
ageadmin;version="1.2",org.osgi.service.url;version="1.0",org.osgi.ut
- il.tracker;version="1.4.2",org.slf4j;version="1.5.0"
+ il.tracker;version="1.4.0",org.slf4j;version="1.5.0"
diff --git a/org.eclipse.gemini.web.core/src/test/resources/META-INF/TEST.MF b/org.eclipse.gemini.web.core/src/test/resources/META-INF/TEST.MF
index a252f55..7b40463 100644
--- a/org.eclipse.gemini.web.core/src/test/resources/META-INF/TEST.MF
+++ b/org.eclipse.gemini.web.core/src/test/resources/META-INF/TEST.MF
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Import-Package: junit.framework,org.easymock,org.eclipse.gemini.web.in
- ternal,org.eclipse.virgo.teststubs.osgi.framework,org.eclipse.virgo.t
- eststubs.osgi.service.event,org.eclipse.virgo.teststubs.osgi.support,
- org.junit
+Import-Package: junit.framework,org.easymock,org.eclipse.virgo.teststu
+ bs.osgi.framework,org.eclipse.virgo.teststubs.osgi.service.event,org.
+ eclipse.virgo.teststubs.osgi.support,org.junit
diff --git a/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF
index 97ba83b..b145810 100644
--- a/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1
Export-Package: org.eclipse.gemini.web.extender;version="1";uses:="org
.eclipse.gemini.web.core,org.osgi.framework,org.osgi.util.tracker"
Bundle-Version: 1
-Tool: Bundlor 1.0.0.M6
+Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Gemini Web Extender
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemini.web.extender.ExtenderActivator
diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF
index 214ad00..d70009e 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-Version: 1.0
-Tool: Bundlor 1.0.0.M6
+Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Gemini Web Tests
Bundle-ManifestVersion: 2
Import-Package: javax.servlet;version="0",junit.framework;version="0",
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 50b3838..afe935d 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
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemini.web.tomcat.internal.Activator