Merge branch 'master' into 352217-new-admin-console
Conflicts:
org.eclipse.virgo.apps.admin.core/.classpath
org.eclipse.virgo.apps.admin.web/.classpath
diff --git a/build.versions b/build.versions
index 51e0466..d6452e4 100644
--- a/build.versions
+++ b/build.versions
@@ -1,12 +1,12 @@
# Compile
-org.eclipse.virgo.kernel=3.5.0.D-20120323105426
-org.eclipse.virgo.nano=3.5.0.BUILD-20120323094700
-org.eclipse.virgo.medic=3.5.0.M03
-org.eclipse.virgo.osgi=3.5.0.M03
-org.eclipse.virgo.repository=3.5.0.M03
-org.eclipse.virgo.util=3.5.0.M03
-org.eclipse.virgo.web=3.5.0.D-20120323114608
-org.eclipse.gemini.web=2.1.0.BUILD-20120306192742
+org.eclipse.virgo.kernel=3.5.0.D-20120403111529
+org.eclipse.virgo.nano=3.5.0.D-20120403110031
+org.eclipse.virgo.medic=3.5.0.D-20120403105200
+org.eclipse.virgo.osgi=3.5.0.D-20120329113120
+org.eclipse.virgo.repository=3.5.0.D-20120403105646
+org.eclipse.virgo.util=3.5.0.D-20120403104609
+org.eclipse.virgo.web=3.5.0.D-20120403115009
+org.eclipse.gemini.web=2.1.0.BUILD-20120320082844
javax.jms=1.1.0
javax.servlet.jsp.jstl=1.2.0.v20110728
javax.servlet.jsp=2.2.0.v201103241009
@@ -26,8 +26,8 @@
org.eclipse.gemini.management=1.0.0.M01-incubation
# Test
-org.eclipse.virgo.teststubs=3.5.0.M03
+org.eclipse.virgo.teststubs=3.5.0.D-20120329112850
org.junit=4.7.0
org.easymock=2.3.0
-org.eclipse.virgo.test=3.5.0.D-20120301131734
+org.eclipse.virgo.test=3.5.0.D-20120403105015
diff --git a/org.eclipse.virgo.apps.repository.core/.classpath b/org.eclipse.virgo.apps.repository.core/.classpath
index 41e80e6..695a0de 100644
--- a/org.eclipse.virgo.apps.repository.core/.classpath
+++ b/org.eclipse.virgo.apps.repository.core/.classpath
@@ -23,20 +23,20 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.M03/org.eclipse.virgo.repository-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M03/org.eclipse.virgo.util.osgi.manifest-3.5.0.M03.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120403105646/org.eclipse.virgo.repository-3.5.0.D-20120403105646.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120403104609/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120403104609.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.0.RELEASE/org.eclipse.gemini.blueprint.core-1.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M03/org.eclipse.virgo.util.io-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.5.0.D-20120323105426/org.eclipse.virgo.kernel.services-3.5.0.D-20120323105426.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120403104609/org.eclipse.virgo.util.io-3.5.0.D-20120403104609.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/3.5.0.D-20120403111529/org.eclipse.virgo.kernel.services-3.5.0.D-20120403111529.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.services-sources-2.1.0.D-20100218174319.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M03/org.eclipse.virgo.util.math-3.5.0.M03.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.D-20120403104609/org.eclipse.virgo.util.math-3.5.0.D-20120403104609.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/APPS_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/2.1.0.BUILD-20120320082844/org.eclipse.gemini.web.core-2.1.0.BUILD-20120320082844.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.M03/org.eclipse.virgo.medic.test-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120403105200/org.eclipse.virgo.medic.test-3.5.0.D-20120403105200.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/1.0.1.CI-59/org.eclipse.virgo.medic.test-sources-1.0.1.CI-59.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.M03/org.eclipse.virgo.medic-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.5.0.D-20120403105200/org.eclipse.virgo.medic-3.5.0.D-20120403105200.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.1.CI-59/org.eclipse.virgo.medic-sources-1.0.1.CI-59.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
diff --git a/org.eclipse.virgo.apps.repository.test/.classpath b/org.eclipse.virgo.apps.repository.test/.classpath
index 1276300..21ffeb5 100644
--- a/org.eclipse.virgo.apps.repository.test/.classpath
+++ b/org.eclipse.virgo.apps.repository.test/.classpath
@@ -7,18 +7,18 @@
<classpathentry kind="var" path="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.M03/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.M03.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.M03/org.eclipse.virgo.util.osgi.manifest-3.5.0.M03.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.M03/org.eclipse.virgo.repository-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M03/org.eclipse.virgo.util.io-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.0.0.M5/org.eclipse.virgo.util.io-sources-2.0.0.M5.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120329113120/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.D-20120329113120.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120403104609/org.eclipse.virgo.util.osgi.manifest-3.5.0.D-20120403104609.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120403105646/org.eclipse.virgo.repository-3.5.0.D-20120403105646.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/2.1.0.D-20100218173658/org.eclipse.virgo.repository-sources-2.1.0.D-20100218173658.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120403104609/org.eclipse.virgo.util.io-3.5.0.D-20120403104609.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.0.0.M5/org.eclipse.virgo.util.io-sources-2.0.0.M5.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/APPS_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120323105426/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120323105426.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-3.5.0.D-20120301131734.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120301131734.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120323105426/org.eclipse.virgo.kernel.osgi-3.5.0.D-20120323105426.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M03/org.eclipse.virgo.util.common-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M03/org.eclipse.virgo.util.common-sources-3.5.0.M03.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/3.5.0.D-20120403111529/org.eclipse.virgo.kernel.deployer-3.5.0.D-20120403111529.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.deployer-sources-2.1.0.D-20100218174319.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120403105015/org.eclipse.virgo.test.framework-3.5.0.D-20120403105015.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120403105015/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120403105015.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/3.5.0.D-20120403111529/org.eclipse.virgo.kernel.osgi-3.5.0.D-20120403111529.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.1.0.D-20100218174319/org.eclipse.virgo.kernel.osgi-sources-2.1.0.D-20100218174319.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120403104609/org.eclipse.virgo.util.common-3.5.0.D-20120403104609.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120403104609/org.eclipse.virgo.util.common-sources-3.5.0.D-20120403104609.jar"/>
<classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.M03/org.eclipse.virgo.osgi.launcher-3.5.0.M03.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.0.0.CI-B50/org.eclipse.virgo.osgi.launcher-sources-2.0.0.CI-B50.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120329113120/org.eclipse.virgo.osgi.launcher-3.5.0.D-20120329113120.jar" sourcepath="/APPS_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.0.0.CI-B50/org.eclipse.virgo.osgi.launcher-sources-2.0.0.CI-B50.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.apps.repository.core"/>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.BUILD-20120323094700/org.eclipse.virgo.deployer.api-3.5.0.BUILD-20120323094700.jar"/>
+ <classpathentry kind="var" path="APPS_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/3.5.0.D-20120403110031/org.eclipse.virgo.deployer.api-3.5.0.D-20120403110031.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
