Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server
Conflicts:
scripts/releaselor/releaselor.rb
diff --git a/build-tomcat-server/repository-ivy.xml b/build-tomcat-server/repository-ivy.xml
index 865a4e8..8d2509f 100644
--- a/build-tomcat-server/repository-ivy.xml
+++ b/build-tomcat-server/repository-ivy.xml
@@ -14,26 +14,29 @@
<dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework}" conf="ext->runtime"/>
<dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.tomcat" rev="${org.eclipse.virgo.web}" conf="ext,transitive->runtime"/>
- <dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="${javax.ejb}" conf="ext->runtime"/>
- <dependency org="javax.jms" name="com.springsource.javax.jms" rev="${javax.jms}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.servlet.adapter" rev="${org.eclipse.virgo.web}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.ejb" rev="${javax.ejb}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.jms" rev="${javax.jms}" conf="ext->runtime"/>
<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="${javax.portlet}" conf="ext->runtime"/>
- <dependency org="javax.servlet" name="javax.servlet" rev="${javax.servlet}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet" rev="${javax.servlet}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="ext->runtime"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="${javax.servlet.jsp.jstl}" conf="ext->runtime"/>
- <dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="${javax.xml.rpc}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="javax.xml.rpc" rev="${javax.xml.rpc}" conf="ext->runtime"/>
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="${org.aopalliance}" conf="ext->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.codec" rev="${org.apache.commons.codec}" conf="ext->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="${org.apache.commons.fileupload}" conf="ext->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="${org.apache.commons.httpclient}" conf="ext->runtime"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="${org.apache.commons.io}" conf="ext->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.event" rev="${org.eclipse.equinox.event}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.event" rev="${org.eclipse.equinox.event}" conf="ext->runtime"/>
<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="${org.apache.taglibs.standard}" conf="ext->runtime"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="ext->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="ext->compile"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="ext->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.commons.logging" rev="${org.slf4j}" conf="ext->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.log4j" rev="${org.slf4j}" conf="ext->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.bridge" rev="${org.slf4j}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="ext->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jcl" rev="${org.slf4j.jcl}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.log4j" rev="${org.slf4j.log4j}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="ext->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt.core.compiler.batch}" conf="ext->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="${org.springframework}" conf="ext->runtime"/>
<dependency org="org.springframework" name="org.springframework.asm" rev="${org.springframework}" conf="ext->runtime"/>
<dependency org="org.springframework" name="org.springframework.aspects" rev="${org.springframework}" conf="ext->runtime"/>
@@ -55,8 +58,15 @@
<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.io" rev="${org.eclipse.gemini.blueprint}" conf="ext->runtime"/>
<exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
+ <exclude org="org.slf4j"/>
+ <exclude org="javax.servlet" module="javax.servlet"/>
+ <exclude org="javax.servlet" module="javax.servlet.jsp"/>
+ <exclude org="org.eclipse.jdt" module="org.eclipse.jdt.core.compiler.batch"/>
<exclude org="org.apache.commons" module="com.springsource.org.apache.commons.logging"/>
<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
+ <exclude org="javax.ejb" module="com.springsource.javax.ejb"/>
+ <exclude org="javax.xml.rpc" module="com.springsource.javax.xml.rpc"/>
+ <exclude org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi"/>
<exclude org="org.eclipse.virgo.util"/>
<exclude org="javax.xml.ws"/>
diff --git a/build.properties b/build.properties
index 4c6a31f..caa8a06 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=3.5.0
+version=3.6.0
release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
ivy.cache.dir=${basedir}/../ivy-cache
diff --git a/build.versions b/build.versions
index 12ecd2b..a765c4e 100644
--- a/build.versions
+++ b/build.versions
@@ -1,18 +1,19 @@
-org.eclipse.virgo.osgi=3.5.0.D-20120615065435
-org.eclipse.virgo.medic=3.5.0.D-20120615070622
-org.eclipse.virgo.kernel=3.5.0.D-20120625080232
-org.eclipse.virgo.repository=3.5.0.D-20120615071313
-org.eclipse.virgo.documentation=3.5.0.D-20120625101035
-org.eclipse.virgo.apps=3.5.0.D-20120625094933
-org.eclipse.virgo.web=3.5.0.D-20120625085707
-org.eclipse.virgo.util=3.5.0.D-20120615065828
-javax.ejb=3.0.0
-javax.jms=1.1.0
+org.eclipse.virgo.osgi=3.6.0.D-20120711092707
+org.eclipse.virgo.medic=3.6.0.D-20120711093918
+org.eclipse.virgo.kernel=3.6.0.D-20120711101519
+org.eclipse.virgo.repository=3.6.0.D-20120711094540
+org.eclipse.virgo.documentation=3.6.0.D-20120711121055
+org.eclipse.virgo.apps=3.6.0.D-20120711115004
+org.eclipse.virgo.web=3.6.0.D-20120711110258
+org.eclipse.virgo.util=3.6.0.D-20120711093140
+javax.ejb=3.0.0.v201203061215
+javax.jms=1.1.0.v201205091237
javax.portlet=2.0.0.v20110525
-javax.servlet=3.0.0.v201103241009
+javax.servlet=3.0.0.v201112011016
+javax.servlet.jsp=2.2.0.v201112011158
javax.servlet.jsp.jstl=1.2.0.v20110728
-javax.transaction=1.1.0
-javax.xml.rpc=1.1.0.v20110517
+javax.transaction=1.1.1.v201105210645
+javax.xml.rpc=1.1.0.v201005080400
org.antlr=3.0.1
org.aopalliance=1.0.0
org.apache.commons.codec=1.3.0
@@ -21,16 +22,21 @@
org.apache.commons.io=1.4.0
org.apache.taglibs.standard=1.1.2.v20110517
org.aspectj=1.6.12.RELEASE
-org.eclipse.osgi=3.7.1.R37x_v20110808-1106
-org.eclipse.osgi.services=3.3.0.v20110513
-org.eclipse.equinox.event=1.2.100.v20110110
+org.eclipse.osgi=3.8.0.v20120508-2119
+org.eclipse.osgi.services=3.3.0.v20120307-2102
+org.eclipse.equinox.event=1.2.100.v20111010-1614
org.junit=4.7.0
org.slf4j=1.6.1
+org.slf4j.api=1.6.4.v20120130-2120
+org.slf4j.jul=1.6.4.v20120130-2120
+org.slf4j.jcl=1.6.4.v20120130-2120
+org.slf4j.log4j=1.6.4.v20120130-2120
org.springframework=3.0.5.RELEASE
org.eclipse.gemini.blueprint=1.0.0.RELEASE
net.sourceforge.jwebunit=2.1.0
org.apache.log4j=1.2.15
org.slf4j.test=1.5.0
com.dumbster=1.6.0
-org.eclipse.virgo.build.tools=1.2.1.RELEASE
-org.eclipse.equinox.launcher=1.3.0.v20111003-1644
+org.eclipse.virgo.build.tools=1.3.0.RELEASE
+org.eclipse.equinox.launcher=1.3.0.v20120308-1358
+org.eclipse.jdt.core.compiler.batch=3.8.0.I20120518-2145
diff --git a/scripts/releaselor/releaselor.rb b/scripts/releaselor/releaselor.rb
index c486724..073c0e3 100755
--- a/scripts/releaselor/releaselor.rb
+++ b/scripts/releaselor/releaselor.rb
@@ -26,6 +26,7 @@
end
else
paths = {
+ 'eclipse-mirror' => 'eclipse-mirror',
'osgi-test-stubs' => 'osgi-test-stubs',
'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
@@ -53,6 +54,7 @@
if args[:product_release] == 'full-product'
ALL_REPOS = [
+ Repository.new(virgo_eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
Repository.new(virgo_eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', bundle_version, release_from_branch, default_targets),
@@ -74,6 +76,7 @@
elsif args[:product_release] == 'kernel'
ALL_REPOS = [
+ Repository.new(virgo_eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
Repository.new(virgo_eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', bundle_version, release_from_branch, default_targets),
@@ -88,6 +91,7 @@
elsif args[:product_release] == 'web-server'
ALL_REPOS = [
+ Repository.new(virgo_eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
Repository.new(virgo_eclipse_repo_root, 'web', paths['web'], 'org.eclipse.virgo.web', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'snaps', paths['snaps'], 'org.eclipse.virgo.snaps', bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-package-build publish-package-download'),
Repository.new(virgo_eclipse_repo_root, 'apps', paths['apps'], 'org.eclipse.virgo.apps', bundle_version, release_from_branch, default_targets),
@@ -99,6 +103,7 @@
elsif args[:product_release] == 'virgo'
ALL_REPOS = [
+ Repository.new(virgo_eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
Repository.new(virgo_eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', bundle_version, release_from_branch, default_targets),
@@ -119,6 +124,7 @@
else
ALL_REPOS = [
+ Repository.new(virgo_eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', bundle_version, release_from_branch, 'clean'),
Repository.new(virgo_eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', bundle_version, release_from_branch, default_targets),
Repository.new(virgo_eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', bundle_version, release_from_branch, default_targets),
diff --git a/scripts/ripplor/ripplor.rb b/scripts/ripplor/ripplor.rb
index a4d9bb8..f94d746 100755
--- a/scripts/ripplor/ripplor.rb
+++ b/scripts/ripplor/ripplor.rb
@@ -19,6 +19,7 @@
end
else
paths = {
+ 'eclipse-mirror' => 'eclipse-mirror',
'osgi-test-stubs' => 'osgi-test-stubs',
'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
@@ -41,6 +42,7 @@
ripple_branch = args[:branch_name]
ALL_REPOS = [
+ Repository.new(eclipse_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], 'org.eclipse.virgo.eclipse-mirror', nil, ripple_branch, 'clean'),
Repository.new(eclipse_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], 'org.eclipse.virgo.teststubs', nil, ripple_branch),
Repository.new(eclipse_repo_root, 'osgi-extensions', paths['osgi-extensions'], 'org.eclipse.virgo.osgi', nil, ripple_branch),
Repository.new(eclipse_repo_root, 'util', paths['util'], 'org.eclipse.virgo.util', nil, ripple_branch),
diff --git a/scripts/virgo-build-updatlor/update-virgo-build-all.rb b/scripts/virgo-build-updatlor/update-virgo-build-all.rb
index cef6fd4..4c2c172 100755
--- a/scripts/virgo-build-updatlor/update-virgo-build-all.rb
+++ b/scripts/virgo-build-updatlor/update-virgo-build-all.rb
@@ -17,6 +17,7 @@
end
else
paths = {
+ 'eclipse-mirror' => 'eclipse-mirror',
'osgi-test-stubs' => 'osgi-test-stubs',
'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
@@ -66,6 +67,7 @@
Repository.new(virgo_repo_root, 'util', paths['util'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'osgi-extensions', paths['osgi-extensions'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'performance-test', paths['performance-test'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'system-verification-tests', paths['system-verification-tests'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'kernel-system-verification-tests', paths['kernel-system-verification-tests'], nil, nil, update_branch),
diff --git a/scripts/virgo-forker/fork.rb b/scripts/virgo-forker/fork.rb
index c483dd4..a523600 100755
--- a/scripts/virgo-forker/fork.rb
+++ b/scripts/virgo-forker/fork.rb
@@ -17,12 +17,14 @@
end
else
paths = {
+ 'eclipse-mirror' => 'eclipse-mirror',
'osgi-test-stubs' => 'osgi-test-stubs',
'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
'test' => 'test',
'medic' => 'medic',
'artifact-repository' => 'artifact-repository',
+ 'nano' => 'nano',
'kernel' => 'kernel',
'kernel-tools' => 'kernel-tools',
'web' => 'web',
@@ -48,12 +50,14 @@
Repository.new(virgo_repo_root, 'web', paths['web'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'kernel-tools', paths['kernel-tools'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'kernel', paths['kernel'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'nano', paths['nano'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'artifact-repository', paths['artifact-repository'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'medic', paths['medic'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'test', paths['test'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'util', paths['util'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'osgi-extensions', paths['osgi-extensions'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], nil, nil, update_branch)
+ Repository.new(virgo_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], nil, nil, update_branch)
]
diff --git a/scripts/virgo-version-updater/versionor.rb b/scripts/virgo-version-updater/versionor.rb
index 33785ce..96a5f40 100755
--- a/scripts/virgo-version-updater/versionor.rb
+++ b/scripts/virgo-version-updater/versionor.rb
@@ -17,6 +17,7 @@
end
else
paths = {
+ 'eclipse-mirror' => 'eclipse-mirror',
'osgi-test-stubs' => 'osgi-test-stubs',
'osgi-extensions' => 'osgi-extensions',
'util' => 'util',
@@ -53,7 +54,8 @@
Repository.new(virgo_repo_root, 'test', paths['test'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'util', paths['util'], nil, nil, update_branch),
Repository.new(virgo_repo_root, 'osgi-extensions', paths['osgi-extensions'], nil, nil, update_branch),
- Repository.new(virgo_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], nil, nil, update_branch)
+ Repository.new(virgo_repo_root, 'osgi-test-stubs', paths['osgi-test-stubs'], nil, nil, update_branch),
+ Repository.new(virgo_repo_root, 'eclipse-mirror', paths['eclipse-mirror'], nil, nil, update_branch)
]
