317056 admin console version now loaded from properties file
diff --git a/build.versions b/build.versions
index 3b4d2ff..a1d9934 100644
--- a/build.versions
+++ b/build.versions
@@ -2,7 +2,7 @@
org.eclipse.virgo.medic=3.0.2.RELEASE
org.eclipse.virgo.osgi=3.0.2.RELEASE
org.eclipse.virgo.repository=3.0.2.RELEASE
-org.eclipse.virgo.apps.repository=3.0.2.RELEASE
+org.eclipse.virgo.apps=3.0.2.RELEASE
org.eclipse.virgo.web=3.0.2.RELEASE
org.eclipse.virgo.util=3.0.2.RELEASE
diff --git a/org.eclipse.virgo.server.svt/src/test/java/org/eclipse/virgo/server/svt/adminconsole/AdminConsoleAppTests.java b/org.eclipse.virgo.server.svt/src/test/java/org/eclipse/virgo/server/svt/adminconsole/AdminConsoleAppTests.java
index 18524eb..ffb2e0a 100644
--- a/org.eclipse.virgo.server.svt/src/test/java/org/eclipse/virgo/server/svt/adminconsole/AdminConsoleAppTests.java
+++ b/org.eclipse.virgo.server.svt/src/test/java/org/eclipse/virgo/server/svt/adminconsole/AdminConsoleAppTests.java
@@ -13,38 +13,46 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+
+import java.io.FileReader;
import java.io.IOException;
+import java.util.Properties;
+
import javax.management.MalformedObjectNameException;
import org.eclipse.virgo.server.svt.AbstractWebTests;
import org.eclipse.virgo.server.svt.UrlWaitLatch;
+import org.junit.Before;
import org.junit.Test;
-
public class AdminConsoleAppTests extends AbstractWebTests {
+
+ private String adminVersion;
+
+ @Before
+ public void setup() throws IOException {
+ Properties prop = new Properties();
+ prop.load(new FileReader("../build.versions"));
+ this.adminVersion = (String) prop.get("org.eclipse.virgo.apps");
+ this.adminVersion = this.adminVersion.substring(0, this.adminVersion.lastIndexOf("."));
+ }
@Test
public void adminApplicationProperties() throws Exception {
- waitForMBeanRegister("plan", "org.eclipse.virgo.apps.admin.plan", "3.0.0", HALF_SECOND,
- TWO_MINUTES);
+ waitForMBeanRegister("plan", "org.eclipse.virgo.apps.admin.plan", this.adminVersion, HALF_SECOND,TWO_MINUTES);
UrlWaitLatch.waitFor("http://localhost:8080/admin");
- assertAdminConsoleArtifactExists("plan", "org.eclipse.virgo.apps.admin.plan", "3.0.0");
- assertAdminConsoleArtifactState("plan", "org.eclipse.virgo.apps.admin.plan", "3.0.0",
- "ACTIVE");
+ assertAdminConsoleArtifactExists("plan", "org.eclipse.virgo.apps.admin.plan", this.adminVersion);
+ assertAdminConsoleArtifactState("plan", "org.eclipse.virgo.apps.admin.plan", this.adminVersion, "ACTIVE");
}
- private void assertAdminConsoleArtifactExists(String type, String name,
- String version) throws IOException, Exception,
- MalformedObjectNameException {
+ private void assertAdminConsoleArtifactExists(String type, String name, String version) throws IOException, Exception, MalformedObjectNameException {
assertTrue(String.format(
"admin console plan artifact %s:%s:%s does not exist", type,
name, version), getMBeanServerConnection().isRegistered(
getObjectName(type, name, version)));
}
- private void assertAdminConsoleArtifactState(String type, String name,
- String version, String state) throws MalformedObjectNameException,
- IOException, Exception {
+ private void assertAdminConsoleArtifactState(String type, String name, String version, String state) throws MalformedObjectNameException, IOException, Exception {
assertEquals(String.format(
"admin console plan artifact %s:%s:%s is not in state %s",
type, name, version, state), state, getMBeanServerConnection()
