Merge branches '380765-shared-ivycache' and 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server into 380765-shared-ivycache
diff --git a/build-tomcat-server/build.xml b/build-tomcat-server/build.xml
index 201aea9..fc62c5b 100644
--- a/build-tomcat-server/build.xml
+++ b/build-tomcat-server/build.xml
@@ -128,8 +128,8 @@
<fileset dir="${basedir}/configuration"/>
</copy>
- <replaceregexp match="initialArtifacts =.*\.springdm"
- replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.springdm, repository:plan/org.eclipse.virgo.web.tomcat" flags="s"
+ <replaceregexp match="initialArtifacts =.*\.blueprint"
+ replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint, repository:plan/org.eclipse.virgo.web.tomcat" flags="s"
file="${tomcat.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
<replaceregexp match="virgo-kernel" replace="virgo-server" flags="g"
diff --git a/build-tomcat-server/configuration/tomcat-server.xml b/build-tomcat-server/configuration/tomcat-server.xml
index 021df19..e2b68be 100644
--- a/build-tomcat-server/configuration/tomcat-server.xml
+++ b/build-tomcat-server/configuration/tomcat-server.xml
@@ -38,8 +38,8 @@
<Engine name="Catalina" defaultHost="localhost">
<Realm className="org.apache.catalina.realm.JAASRealm" appName="virgo-kernel"
- userClassNames="org.eclipse.virgo.kernel.authentication.User"
- roleClassNames="org.eclipse.virgo.kernel.authentication.Role"/>
+ userClassNames="org.eclipse.virgo.nano.authentication.User"
+ roleClassNames="org.eclipse.virgo.nano.authentication.Role"/>
<Host name="localhost" appBase=""
unpackWARs="false" autoDeploy="false"
diff --git a/build.versions b/build.versions
index 58715f8..e8318d3 100644
--- a/build.versions
+++ b/build.versions
@@ -1,11 +1,10 @@
-org.eclipse.virgo.osgi=3.6.0.D-20120711092707
-org.eclipse.virgo.medic=3.6.0.D-20120717201225
-org.eclipse.virgo.kernel=3.6.0.D-20120727123513
-org.eclipse.virgo.repository=3.6.0.D-20120717202028
-org.eclipse.virgo.documentation=3.6.0.D-20120727143446
-org.eclipse.virgo.apps=3.6.0.D-20120727141530
-org.eclipse.virgo.web=3.6.0.D-20120727132746
-org.eclipse.virgo.util=3.6.0.D-20120717181632
+org.eclipse.virgo.medic=3.6.0.D-20120813141556
+org.eclipse.virgo.kernel=3.6.0.D-20120815193847
+org.eclipse.virgo.repository=3.6.0.D-20120813144240
+org.eclipse.virgo.documentation=3.6.0.D-20120815214500
+org.eclipse.virgo.apps=3.6.0.D-20120815212103
+org.eclipse.virgo.web=3.6.0.D-20120815202935
+org.eclipse.virgo.util=3.6.0.D-20120813140754
javax.ejb=3.0.0.v201203061215
javax.jms=1.1.0.v201205091237
javax.portlet=2.0.0.v20110525
diff --git a/org.eclipse.virgo.server.smoketest/src/test/java/org/eclipse/virgo/server/smoketest/FormTagsTests.java b/org.eclipse.virgo.server.smoketest/src/test/java/org/eclipse/virgo/server/smoketest/FormTagsTests.java
index b9f7e3c..2ccc628 100644
--- a/org.eclipse.virgo.server.smoketest/src/test/java/org/eclipse/virgo/server/smoketest/FormTagsTests.java
+++ b/org.eclipse.virgo.server.smoketest/src/test/java/org/eclipse/virgo/server/smoketest/FormTagsTests.java
@@ -12,17 +12,20 @@
package org.eclipse.virgo.server.smoketest;
import org.junit.Test;
+import org.junit.Ignore;
public class FormTagsTests {
private static final String BASE_URL = "http://localhost:8080/formtags-par/";
@Test
+ @Ignore
public void testFormTagsListScreen() {
UrlWaitLatch.waitFor(BASE_URL + "list.htm");
}
@Test
+ @Ignore
public void testFormTagsFormScreen() {
UrlWaitLatch.waitFor(BASE_URL + "form.htm?id=1");
}
diff --git a/scripts/virgoise.sh b/scripts/virgoise.sh
deleted file mode 100755
index a0fee10..0000000
--- a/scripts/virgoise.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-dir=`dirname $0`
-dir=`cd $dir;pwd`
-
-for f in $(find . -iname "*.java" -or -iname "*.aj" -or -iname "*.xml" -or -iname ".project" -or -iname "*.MF" -or -iname "*.mf" -or -iname ".prefs" -or -iname ".classpath" -or -iname "build.versions" -or -iname "*.properties" -or -iname "*.bat" -or -iname "*.sh" -or -iname "*.conf" -or -iname "*.profile" -or -iname "*.config" -or -iname "*.plan" -or -iname "runner.bundles")
-do
-
-sed -i -e 's/com\.springsource\.osgi\.teststubs/org.eclipse.virgo.teststubs.osgi/g' $f
-sed -i -e 's/com\.springsource\.osgi\.stub/org.eclipse.virgo.teststubs.osgi/g' $f
-sed -i -e 's/OSGI_TEST_STUBS_IVY_CACHE/TEST_STUBS_IVY_CACHE/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.test\.stubs/org.eclipse.virgo.teststubs.osgi/g' $f
-sed -i -e 's/com\.springsource\.osgi\.extensions/org.eclipse.virgo.osgi.extensions/g' $f
-sed -i -e 's/com\.springsource\.osgi\.launcher/org.eclipse.virgo.osgi.launcher/g' $f
-
-sed -i -e 's/com\.springsource\.util/org.eclipse.virgo.util/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.test/org.eclipse.virgo.test/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.medic/org.eclipse.virgo.medic/g' $f
-sed -i -e 's/com\.springsource\.ch\.qos\.logback\.classic\.woven/org.eclipse.virgo.ch.qos.logback.classic.woven/g' $f
-
-sed -i -e 's/com\.springsource\.repository/org.eclipse.virgo.repository/g' $f
-
-sed -i -e 's/com\.springsource\.osgi/org.eclipse.virgo.osgi/g' $f
-
-sed -i -e 's/com\.springsource\.kernel/org.eclipse.virgo.kernel/g' $f
-
-sed -i -e 's/com\/springsource\/kernel/org\/eclipse\/virgo\/kernel/g' $f
-
-sed -i -e 's/org\.eclipse\.virgo\.osgi\.test/org.eclipse.virgo.test/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.webcontainer/org.eclipse.gemini.web/g' $f
-
-sed -i -e 's/org\.eclipse\.virgo\.osgi\.webcontainer/org.eclipse.gemini.web/g' $f
-
-rm $f-e
-done
-
-$dir/update-dependency.rb -v org.eclipse.virgo.teststubs -n 1.0.0.D-20100311162851
-$dir/update-dependency.rb -v org.eclipse.virgo.osgi -n 2.1.0.D-20100311163103
-$dir/update-dependency.rb -v org.eclipse.virgo.util -n 2.1.0.D-20100311163244
-$dir/update-dependency.rb -v org.eclipse.virgo.test -n 2.1.0.D-20100311163545
-$dir/update-dependency.rb -v org.eclipse.virgo.medic -n 1.0.1.D-20100311163649
-$dir/update-dependency.rb -v org.eclipse.virgo.repository -n 2.1.0.D-20100311164021
-$dir/update-dependency.rb -v org.eclipse.virgo.kernel -n 2.1.0.D-20100311164357
-$dir/update-dependency.rb -v org.eclipse.gemini.web -n 1.0.0.BUILD-20100312113743
-
-
-
