JBoss Tools SVN: r30703 - in trunk/as: plugins/org.jboss.ide.eclipse.as.management.as7 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-21 11:28:12 -0400 (Thu, 21 Apr 2011)
New Revision: 30703
Modified:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/TypedDeployer.java
Log:
[JBIDE-8769] implementing state checking
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java 2011-04-21 15:01:38 UTC (rev 30702)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java 2011-04-21 15:28:12 UTC (rev 30703)
@@ -21,6 +21,8 @@
*/
package org.jboss.ide.eclipse.as.management.as7.tests;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -32,9 +34,11 @@
import org.jboss.ide.eclipse.as.management.as7.deployment.DeployerException;
import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer;
-import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer.DeploymentResult;
+import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer.DeploymentPlanResult;
+import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer.DeploymentState;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -49,21 +53,22 @@
public void setUp() throws UnknownHostException {
this.deployer = new TypedDeployer(DeployerTestUtils.HOST, DeployerTestUtils.MGMT_PORT);
}
-
+
@After
public void tearDown() {
deployer.dispose();
}
-
+
+ @Ignore
@Test
public void canDeploy() throws Exception {
File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
try {
waitUntilFinished(deployer.deploy(warFile));
-
+
String response = DeployerTestUtils.getWebappResponse(
"minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
- assertTrue(response != null
+ assertTrue(response != null
&& response.indexOf("minimalistic") >= 0);
} finally {
@@ -71,15 +76,16 @@
}
}
+ @Ignore
@Test
public void deployedWarIsResponding() throws Exception {
File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
try {
waitUntilFinished(deployer.deploy(warFile));
-
+
String response = DeployerTestUtils.getWebappResponse(
"minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
- assertTrue(response != null
+ assertTrue(response != null
&& response.indexOf("minimalistic") >= 0);
} finally {
@@ -87,6 +93,7 @@
}
}
+ @Ignore
@Test(expected = DeployerException.class)
public void cannotDeployWarTwice() throws Exception {
File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
@@ -98,11 +105,13 @@
}
}
+ @Ignore
@Test(expected = DeployerException.class)
public void cannotUndeployNondeployed() throws DeployerException, InterruptedException, ExecutionException {
waitUntilFinished(deployer.undeploy("inexistant"));
}
+ @Ignore
@Test
public void canReplaceWar() throws Exception {
File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
@@ -113,26 +122,53 @@
waitUntilFinished(deployer.replace(name, warFile2));
String response = DeployerTestUtils.getWebappResponse(
"minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
- assertTrue(response != null
+ assertTrue(response != null
&& response.indexOf("GWT") >= 0);
} finally {
quietlyUndeploy(name);
}
}
-
+
@Test
- public void canQueryDeploymentState() throws URISyntaxException, IOException, DeployerException {
+ public void getEnabledStateIfDeploymentIsDeployed() throws URISyntaxException, IOException, DeployerException {
String deploymentName = "testDeployment";
File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
try {
waitUntilFinished(deployer.deploy(deploymentName, warFile));
- String state = deployer.getDeploymentState(deploymentName);
+ DeploymentState state = deployer.getDeploymentState(deploymentName);
assertNotNull(state);
+ assertThat(state, equalTo(DeploymentState.ENABLEDSTATE));
} finally {
quietlyUndeploy(deploymentName);
}
}
-
+
+ @Test
+ public void getDisabledStateIfDeploymentIsOnlyAdded() throws URISyntaxException, IOException, DeployerException {
+ String deploymentName = "testDeployment";
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
+ try {
+ waitUntilFinished(deployer.deploy(deploymentName, warFile));
+ DeploymentState state = deployer.getDeploymentState(deploymentName);
+ assertNotNull(state);
+ assertThat(state, equalTo(DeploymentState.ENABLEDSTATE));
+ } finally {
+ quietlyUndeploy(deploymentName);
+ }
+ }
+
+ @Test(expected=DeployerException.class)
+ public void getErrorIfDeploymentIsNotDeployed() throws URISyntaxException, IOException, DeployerException {
+ String deploymentName = "testDeployment";
+ try {
+ DeploymentState state = deployer.getDeploymentState(deploymentName);
+ assertNotNull(state);
+ assertThat(state, equalTo(DeploymentState.ENABLEDSTATE));
+ } finally {
+ quietlyUndeploy(deploymentName);
+ }
+ }
+
private void quietlyUndeploy(String name) {
try {
waitUntilFinished(deployer.undeploy(name));
@@ -141,12 +177,12 @@
// ignore
}
}
-
+
private void quietlyUndeploy(File file) {
quietlyUndeploy(file.getName());
}
-
- private void waitUntilFinished(DeploymentResult result) throws DeployerException {
+
+ private void waitUntilFinished(DeploymentPlanResult result) throws DeployerException {
result.getStatus(); // wait for operation to finish
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath 2011-04-21 15:01:38 UTC (rev 30702)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath 2011-04-21 15:28:12 UTC (rev 30703)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="/jboss-as-controller-client"/>
<classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-dmr-1.0.0.Beta5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta3.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar" sourcepath="/home/adietish/jboss-workspaces/jboss-tools/jbosstools-src/jboss-threads-2.0.0.CR8-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java 2011-04-21 15:01:38 UTC (rev 30702)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossDeploymentManager.java 2011-04-21 15:28:12 UTC (rev 30703)
@@ -4,29 +4,29 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentManager;
-import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer.DeploymentResult;
+import org.jboss.ide.eclipse.as.management.as7.deployment.TypedDeployer.DeploymentPlanResult;
public class JBossDeploymentManager implements IJBoss7DeploymentManager {
- public DeploymentResult deployAsync(String host, int port, String deploymentName,
+ public DeploymentPlanResult deployAsync(String host, int port, String deploymentName,
File file, IProgressMonitor monitor) throws Exception {
TypedDeployer deployer = new TypedDeployer(host, port);
return deployer.deploy(deploymentName, file);
}
- public DeploymentResult deploySync(String host, int port, String deploymentName,
+ public DeploymentPlanResult deploySync(String host, int port, String deploymentName,
File file, IProgressMonitor monitor) throws Exception {
TypedDeployer deployer = new TypedDeployer(host, port);
return deployer.deploySync(deploymentName, file, monitor);
}
- public DeploymentResult undeployAsync(String host, int port, String deploymentName,
+ public DeploymentPlanResult undeployAsync(String host, int port, String deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
TypedDeployer deployer = new TypedDeployer(host, port);
return deployer.undeploy(deploymentName);
}
- public DeploymentResult syncUndeploy(String host, int port, String deploymentName,
+ public DeploymentPlanResult syncUndeploy(String host, int port, String deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
TypedDeployer deployer = new TypedDeployer(host, port);
return deployer.undeploySync(deploymentName, monitor);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementUtil.java 2011-04-21 15:01:38 UTC (rev 30702)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBossManagementUtil.java 2011-04-21 15:28:12 UTC (rev 30703)
@@ -37,6 +37,7 @@
import org.jboss.as.controller.client.ModelControllerClient;
import org.jboss.as.controller.client.Operation;
import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.ModelType;
import org.jboss.dmr.Property;
import org.jboss.ide.eclipse.as.management.as7.internal.DefaultOperationRequestBuilder;
import org.jboss.ide.eclipse.as.management.as7.internal.OperationFormatException;
@@ -131,6 +132,22 @@
return Collections.emptyList();
}
+ public static Boolean getBooleanProperty(String propertyName, ModelNode node) {
+ if (node == null) {
+ return null;
+ }
+ ModelNode valueNode = node.get(propertyName);
+ if (valueNode == null) {
+ return null;
+ }
+ String value = valueNode.toString();
+ if (value == null
+ || valueNode.getType() != ModelType.BOOLEAN) {
+ return null;
+ }
+ return Boolean.valueOf(value);
+ }
+
public static ModelNode execute(Operation operation, ModelControllerClient client) throws DeployerException {
try {
ModelNode result = client.execute(operation);
@@ -142,7 +159,7 @@
throw new DeployerException(result.get(FAILURE_DESCRIPTION).toString());
}
else {
- throw new DeployerException("Operation outcome is " + result.get(OUTCOME).asString());
+ throw new DeployerException("Operation outcome is " + result.get(OUTCOME).asString());
}
} catch (IOException e) {
throw new DeployerException(e);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/TypedDeployer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/TypedDeployer.java 2011-04-21 15:01:38 UTC (rev 30702)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/TypedDeployer.java 2011-04-21 15:28:12 UTC (rev 30703)
@@ -22,9 +22,12 @@
package org.jboss.ide.eclipse.as.management.as7.deployment;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.ADDRESS;
-import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.NAME;
+import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.DEPLOYMENT;
+import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.ENABLED;
+import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.FAILURE_DESCRIPTION;
import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.OP;
-import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION;
+import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.READ_RESOURCE_OPERATION;
+import static org.jboss.ide.eclipse.as.management.as7.deployment.ModelDescriptionConstants.RESULT;
import java.io.File;
import java.io.IOException;
@@ -37,7 +40,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.jboss.as.controller.client.ModelControllerClient;
-import org.jboss.as.controller.client.OperationBuilder;
import org.jboss.as.controller.client.helpers.standalone.DeploymentAction;
import org.jboss.as.controller.client.helpers.standalone.DeploymentPlanBuilder;
import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult;
@@ -61,33 +63,33 @@
this.manager = ServerDeploymentManager.Factory.create(client);
}
- public DeploymentResult undeploySync(String name, IProgressMonitor monitor) throws DeployerException {
- DeploymentResult result = undeploy(name);
+ public DeploymentPlanResult undeploySync(String name, IProgressMonitor monitor) throws DeployerException {
+ DeploymentPlanResult result = undeploy(name);
result.getStatus();
return result;
}
- public DeploymentResult deploySync(String name, File file, IProgressMonitor monitor) throws DeployerException {
- DeploymentResult result = deploy(name, file);
+ public DeploymentPlanResult deploySync(String name, File file, IProgressMonitor monitor) throws DeployerException {
+ DeploymentPlanResult result = deploy(name, file);
result.getStatus();
return result;
}
- public DeploymentResult undeploy(String name) throws DeployerException {
+ public DeploymentPlanResult undeploy(String name) throws DeployerException {
try {
DeploymentPlanBuilder builder = manager.newDeploymentPlan();
builder = builder.undeploy(name).andRemoveUndeployed();
- return new DeploymentResult(builder.getLastAction(), manager.execute(builder.build()));
+ return new DeploymentPlanResult(builder.getLastAction(), manager.execute(builder.build()));
} catch (Exception e) {
throw new DeployerException(e);
}
}
- public DeploymentResult deploy(File file) throws DeployerException {
+ public DeploymentPlanResult deploy(File file) throws DeployerException {
return deploy(file.getName(), file);
}
- public DeploymentResult deploy(String name, File file) throws DeployerException {
+ public DeploymentPlanResult deploy(String name, File file) throws DeployerException {
try {
return execute(manager.newDeploymentPlan().add(name, file).andDeploy());
} catch (IOException e) {
@@ -95,11 +97,11 @@
}
}
- public DeploymentResult replace(File file) throws DeployerException {
+ public DeploymentPlanResult replace(File file) throws DeployerException {
return replace(file.getName(), file);
}
- public DeploymentResult replace(String name, File file) throws DeployerException {
+ public DeploymentPlanResult replace(String name, File file) throws DeployerException {
try {
return execute(manager.newDeploymentPlan().replace(name, file));
} catch (IOException e) {
@@ -107,36 +109,48 @@
}
}
- private DeploymentResult execute(DeploymentPlanBuilder builder) throws DeployerException {
+ public DeploymentState getDeploymentState(String name) throws DeployerException {
+ ModelNode request = new ModelNode();
+ request.get(OP).set(READ_RESOURCE_OPERATION);
+ request.get(ADDRESS).add(DEPLOYMENT, name);
+
+ ModelNode result = execute(request);
+ return DeploymentState.getForResultNode(result);
+ }
+
+ public void dispose() {
+ StreamUtils.safeClose(client);
+ }
+
+ private ModelNode execute(ModelNode node) throws DeployerException {
try {
+ ModelNode response = client.execute(node);
+ if (!JBossManagementUtil.isSuccess(response)) {
+ throw new DeployerException(
+ MessageFormat.format("Could not execute {0} for {1}. Failure was {2}.", node.get(OP), node.get(ADDRESS), response.get(FAILURE_DESCRIPTION)));
+ }
+ return response.get(RESULT);
+ } catch (Exception e) {
+ throw new DeployerException(e);
+ }
+ }
+
+ private DeploymentPlanResult execute(DeploymentPlanBuilder builder) throws DeployerException {
+ try {
DeploymentAction action = builder.getLastAction();
Future<ServerDeploymentPlanResult> planResult = manager.execute(builder.build());
- return new DeploymentResult(action, planResult);
+ return new DeploymentPlanResult(action, planResult);
} catch (Exception e) {
throw new DeployerException(e);
}
}
- public String getServerName() throws DeployerException {
- ModelNode request = new ModelNode();
- request.get(OP).set(READ_ATTRIBUTE_OPERATION);
- request.get(ADDRESS).set(ADDRESS);
- request.get(NAME).set(NAME);
+ public static class DeploymentPlanResult {
- ModelNode response = JBossManagementUtil.execute(OperationBuilder.Factory.create(request).build(), client);
- return response.asString();
- }
-
- public void dispose() {
- StreamUtils.safeClose(client);
- }
-
- public static class DeploymentResult {
-
private Future<ServerDeploymentPlanResult> planResult;
private DeploymentAction action;
- public DeploymentResult(DeploymentAction action, Future<ServerDeploymentPlanResult> planResult) {
+ public DeploymentPlanResult(DeploymentAction action, Future<ServerDeploymentPlanResult> planResult) {
Assert.isNotNull(action);
this.action = action;
Assert.isNotNull(planResult);
@@ -190,4 +204,34 @@
}
}
+ public enum DeploymentState {
+ ENABLEDSTATE {
+ protected boolean matches(boolean enabled) {
+ return enabled == true;
+ }
+ },
+ STOPPEDSTATE {
+ protected boolean matches(boolean enabled) {
+ return enabled == false;
+ }
+ };
+
+ public static DeploymentState getForResultNode(ModelNode resultNode) {
+ Boolean enabled = JBossManagementUtil.getBooleanProperty(ENABLED, resultNode);
+ if (enabled == null) {
+ return null;
+ }
+
+ DeploymentState matchingState = null;
+ for(DeploymentState state : values()) {
+ if (state.matches(enabled)) {
+ matchingState = state;
+ }
+ }
+ return matchingState;
+ }
+
+ protected abstract boolean matches(boolean enabled);
+
+ }
}
14 years, 11 months
JBoss Tools SVN: r30700 - in branches/xulrunner-1.9.2.16/xulrunner/plugins: org.mozilla.xpcom/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-04-21 10:45:20 -0400 (Thu, 21 Apr 2011)
New Revision: 30700
Removed:
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/xulrunner/
Modified:
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/MozillaGlue.jar
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/MozillaInterfaces.jar
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF
branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF
Log:
- Removed old XULRunner 1.9.1.2a from the 1.9.2.16 branch and modified.
- Changed versions of plugins in manifest files
- Replaced org.mozilla.xpcom jars
Modified: branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2011-04-21 13:03:15 UTC (rev 30699)
+++ branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2011-04-21 14:45:20 UTC (rev 30700)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mozilla XPCOM Eclipse plugin
Bundle-SymbolicName: org.mozilla.xpcom;singleton:=true
-Bundle-Version: 1.9.1.2a
+Bundle-Version: 1.9.2.16
Bundle-ClassPath: MozillaGlue.jar,
MozillaInterfaces.jar
Export-Package: org.mozilla.interfaces,
Modified: branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/MozillaGlue.jar
===================================================================
(Binary files differ)
Modified: branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xpcom/MozillaInterfaces.jar
===================================================================
(Binary files differ)
Modified: branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2011-04-21 13:03:15 UTC (rev 30699)
+++ branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/META-INF/MANIFEST.MF 2011-04-21 14:45:20 UTC (rev 30700)
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mozilla Xulrunner
Bundle-SymbolicName: org.mozilla.xulrunner.cocoa.macosx;singleton:=true
-Bundle-Version: 1.9.1.2a
+Bundle-Version: 1.9.2.16
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)))
Modified: branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2011-04-21 13:03:15 UTC (rev 30699)
+++ branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2011-04-21 14:45:20 UTC (rev 30700)
@@ -3,7 +3,7 @@
Bundle-Name: Mozilla Xulrunner
Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86;singleton:=tr
ue
-Bundle-Version: 1.9.1.2
+Bundle-Version: 1.9.2.16
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86))
Modified: branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2011-04-21 13:03:15 UTC (rev 30699)
+++ branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/META-INF/MANIFEST.MF 2011-04-21 14:45:20 UTC (rev 30700)
@@ -3,7 +3,7 @@
Bundle-Name: Mozilla Xulrunner Linux x86_64
Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86_64;singleton:
=true
-Bundle-Version: 1.9.1.2a
+Bundle-Version: 1.9.2.16
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=gtk)(osgi.os=linux)(osgi.arch=x86_64))
Modified: branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF
===================================================================
--- branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2011-04-21 13:03:15 UTC (rev 30699)
+++ branches/xulrunner-1.9.2.16/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/META-INF/MANIFEST.MF 2011-04-21 14:45:20 UTC (rev 30700)
@@ -3,7 +3,7 @@
Bundle-Name: Mozilla Xulrunner
Bundle-SymbolicName: org.mozilla.xulrunner.win32.win32.x86;singleton:=
true
-Bundle-Version: 1.9.1.2
+Bundle-Version: 1.9.2.16
Bundle-Vendor: mozilla.org
Eclipse-PlatformFilter: (& (osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))
14 years, 11 months
Newsletter Thu, 21 Apr 2011 06:27:10 -0800
by Eerin
Special News for you!
Do you want a prosperous future, soar in money, and brownie points?
Today only:
We can assist with Diplomas from prestigious universities based on your present knowledge and professional experience.
Get a Degree in 5 weeks with our program!
~Our program will let EVERYONE with professional experience
get a 100% verified Degree:
~Doctorate
~Bachelors
~Masters
- Think about it...
- Just follow YOUR Dreams!
- Live a wonderful life by earning or upgrading your degree.
This is a good chance to make a right move and receive your due
benefits... if you are qualified but are lacking that piece of paper. Get one from us in a fraction of the time.
Call us NOW to start improving your life!
~CALL~
1-916-484-3795
You must leave us a voice message with your name and phone number with country code if outside USA and we'll call you back asap.
It is your decision...
Make the right decision.
Best regards.
Do Not Reply to this Email.
We do not reply to text inquiries, and our server will reject all response traffic.
We apologize for any inconvenience this may have caused you.
14 years, 11 months
JBoss Tools SVN: r30699 - trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-21 09:03:15 -0400 (Thu, 21 Apr 2011)
New Revision: 30699
Modified:
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java
trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java
Log:
[JBIDE-8690] corrected tests
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java 2011-04-21 13:01:50 UTC (rev 30698)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/DeployerTestUtils.java 2011-04-21 13:03:15 UTC (rev 30699)
@@ -23,6 +23,7 @@
import java.io.BufferedInputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
@@ -39,10 +40,10 @@
* @author André Dietisheim
*/
public class DeployerTestUtils {
-
+
public static final String GWT_HELLOWORLD_WAR = "gwt-helloworld.war";
public static final String MINIMALISTIC_WAR = "minimalistic.war";
-
+
public static final String HOST = "localhost";
public static final int MGMT_PORT = 9999;
public static final int WEB_PORT = 8080;
@@ -51,7 +52,8 @@
private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as.management.as7.tests";
private static final int WEBAPP_RESPONSE_TIMEOUT = 10 * 1024;
-
+ private static final long WAIT_DEPLOYED_TIMEOUT = 10 * 1024;
+
public static File getWarFile(String name) throws URISyntaxException, IOException {
Bundle bundle = Platform.getBundle(BUNDLE_ID);
URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
@@ -59,12 +61,21 @@
}
public static String getWebappResponse(String name, String host, int port) throws IOException {
- return getServerResponse(new URL(
- MessageFormat.format(
- "http://{0}:{1}/{2}", host, String.valueOf(port), name)));
+ long until = System.currentTimeMillis() + WAIT_DEPLOYED_TIMEOUT;
+ while (System.currentTimeMillis() < until) {
+ try {
+ return getServerResponse(new URL(
+ MessageFormat.format(
+ "http://{0}:{1}/{2}", host, String.valueOf(port), name)));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+
+ }
+ return null;
}
- public static String getServerResponse(URL url) throws IOException {
+ public static String getServerResponse(URL url) throws IOException {
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setUseCaches(false);
connection.setDoInput(true);
Modified: trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java
===================================================================
--- trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java 2011-04-21 13:01:50 UTC (rev 30698)
+++ trunk/as/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/management/as7/tests/TypedDeployerIntegrationTest.java 2011-04-21 13:03:15 UTC (rev 30699)
@@ -21,9 +21,12 @@
*/
package org.jboss.ide.eclipse.as.management.as7.tests;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.concurrent.ExecutionException;
@@ -60,7 +63,8 @@
String response = DeployerTestUtils.getWebappResponse(
"minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
- assertTrue(response.indexOf("minimalistic") >= 0);
+ assertTrue(response != null
+ && response.indexOf("minimalistic") >= 0);
} finally {
quietlyUndeploy(warFile);
@@ -68,14 +72,15 @@
}
@Test
- public void deployedWarHasDeployedStatus() throws Exception {
+ public void deployedWarIsResponding() throws Exception {
File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
try {
waitUntilFinished(deployer.deploy(warFile));
String response = DeployerTestUtils.getWebappResponse(
"minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
- assertTrue(response.indexOf("minimalistic") >= 0);
+ assertTrue(response != null
+ && response.indexOf("minimalistic") >= 0);
} finally {
quietlyUndeploy(warFile);
@@ -108,21 +113,39 @@
waitUntilFinished(deployer.replace(name, warFile2));
String response = DeployerTestUtils.getWebappResponse(
"minimalistic", DeployerTestUtils.HOST, DeployerTestUtils.WEB_PORT);
- assertTrue(response.indexOf("GWT") >= 0);
+ assertTrue(response != null
+ && response.indexOf("GWT") >= 0);
} finally {
- quietlyUndeploy(warFile);
+ quietlyUndeploy(name);
}
}
- private void quietlyUndeploy(File file) {
+ @Test
+ public void canQueryDeploymentState() throws URISyntaxException, IOException, DeployerException {
+ String deploymentName = "testDeployment";
+ File warFile = DeployerTestUtils.getWarFile(DeployerTestUtils.MINIMALISTIC_WAR);
try {
- waitUntilFinished(deployer.undeploy(file.getName()));
+ waitUntilFinished(deployer.deploy(deploymentName, warFile));
+ String state = deployer.getDeploymentState(deploymentName);
+ assertNotNull(state);
+ } finally {
+ quietlyUndeploy(deploymentName);
+ }
+ }
+
+ private void quietlyUndeploy(String name) {
+ try {
+ waitUntilFinished(deployer.undeploy(name));
} catch (Exception e) {
e.printStackTrace();
// ignore
}
}
+ private void quietlyUndeploy(File file) {
+ quietlyUndeploy(file.getName());
+ }
+
private void waitUntilFinished(DeploymentResult result) throws DeployerException {
result.getStatus(); // wait for operation to finish
}
14 years, 11 months
JBoss Tools SVN: r30698 - trunk/documentation/qa/docs/Test_Cases.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-04-21 09:01:50 -0400 (Thu, 21 Apr 2011)
New Revision: 30698
Modified:
trunk/documentation/qa/docs/Test_Cases/VPEtests.doc
Log:
Automated another Ajax Tags Tests.
Modified: trunk/documentation/qa/docs/Test_Cases/VPEtests.doc
===================================================================
(Binary files differ)
14 years, 11 months
JBoss Tools SVN: r30697 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/tags and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-04-21 08:58:24 -0400 (Thu, 21 Apr 2011)
New Revision: 30697
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/LogTagTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java
Log:
Added new Ajax Tags Tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-04-21 12:04:37 UTC (rev 30696)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-04-21 12:58:24 UTC (rev 30697)
@@ -60,6 +60,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.tags.InplaceSelectInputTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ListShuttleTagTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.tags.LogTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.PanelMenuTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.PanelTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.PickListTagTest;
@@ -167,6 +168,7 @@
suite.addTestSuite(HtmlCommandLinkTagTest.class);
suite.addTestSuite(IncludeTagTest.class);
suite.addTestSuite(AjaxInvisibleTagsTest.class);
+ suite.addTestSuite(LogTagTest.class);
suite.addTestSuite(XhtmlFilePerformanceTest.class);
return new TestSetup(suite);
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java 2011-04-21 12:04:37 UTC (rev 30696)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxInvisibleTagsTest.java 2011-04-21 12:58:24 UTC (rev 30697)
@@ -22,6 +22,8 @@
private static final String KEEP_ALIVE_VALUE = "*! KeepAlive Value";
private static final String SUPPORT_VALUE = "*! Support Value";
private static final String STATUS_VALUE = "*! Status Value";
+ private static final String LOAD_SCRIPT_VALUE = "*! loadScript Value";
+ private static final String LOAD_STYLE_VALUE = "*! loadStyle Value";
@Override
protected void initTestPage() {
initTestPage(TestPageType.JSP,
@@ -39,6 +41,8 @@
" <a4j:keepAlive beanName=\"\">" + AjaxInvisibleTagsTest.KEEP_ALIVE_VALUE + "</a4j:keepAlive>\n" +
" <a4j:support>" + AjaxInvisibleTagsTest.SUPPORT_VALUE + "</a4j:support>\n" +
" <a4j:status>" + AjaxInvisibleTagsTest.STATUS_VALUE + "</a4j:status>\n" +
+ " <a4j:loadScript src=\"\">" + AjaxInvisibleTagsTest.LOAD_SCRIPT_VALUE + "</a4j:loadScript>\n" +
+ " <a4j:loadStyle src=\"\">" + AjaxInvisibleTagsTest.LOAD_STYLE_VALUE + "</a4j:loadStyle>\n" +
" </f:view>\n" +
" </body> \n" +
"</html>");
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/LogTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/LogTagTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/LogTagTest.java 2011-04-21 12:58:24 UTC (rev 30697)
@@ -0,0 +1,72 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.tags;
+
+import org.jboss.tools.ui.bot.ext.Timing;
+
+/**
+ * Tests Ajax Log Tag behavior
+ * @author vlado pakan
+ *
+ */
+public class LogTagTest extends AbstractTagTest{
+ private static final String LOG_TEXT = "!*- Log Text";
+ @Override
+ protected void initTestPage() {
+ initTestPage(TestPageType.JSP,
+ "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" +
+ "<%@ taglib uri=\"http://richfaces.org/a4j\" prefix=\"a4j\" %>\n" +
+ "<html>\n" +
+ " <head>\n" +
+ " </head>\n" +
+ " <body>\n" +
+ " <f:view>\n" +
+ " <a4j:log>\n" +
+ " " + LogTagTest.LOG_TEXT + "\n" +
+ " </a4j:log>\n" +
+ " </f:view>\n" +
+ " </body> \n" +
+ "</html>");
+ }
+
+ @Override
+ protected void verifyTag() {
+ assertVisualEditorContains(getVisualEditor(),
+ "BUTTON",
+ new String[]{"type"},
+ new String[]{"button"},
+ getTestPageFileName());
+ assertVisualEditorContainsNodeWithValue(getVisualEditor(),
+ LogTagTest.LOG_TEXT,
+ getTestPageFileName());
+ assertVisualEditorContainsNodeWithValue(getVisualEditor(),
+ "Clear",
+ getTestPageFileName());
+ // check tag selection
+ getVisualEditor().selectDomNode(getVisualEditor().getDomNodeByTagName("BUTTON",0), 0);
+ bot.sleep(Timing.time3S());
+ String selectedText = getSourceEditor().getSelection();
+ String hasToStartWith = "<a4j:log>";
+ assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().startsWith(hasToStartWith));
+ String hasEndWith = "</a4j:log>";
+ assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().endsWith(hasEndWith));
+ String hasToContain = LogTagTest.LOG_TEXT;
+ assertTrue("Selected text in Source Pane has to contain '" + hasToContain + "'" +
+ "\nbut it is '" + selectedText + "'",
+ selectedText.trim().contains(hasToContain));
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/LogTagTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 11 months
JBoss Tools SVN: r30696 - branches/xulrunner-1.9.2.16.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-04-21 08:04:37 -0400 (Thu, 21 Apr 2011)
New Revision: 30696
Added:
branches/xulrunner-1.9.2.16/xulrunner/
Log:
BraCreated branch for XULRunner 1.9.2.16. Step 2
14 years, 11 months
JBoss Tools SVN: r30695 - branches.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-04-21 08:01:43 -0400 (Thu, 21 Apr 2011)
New Revision: 30695
Added:
branches/xulrunner-1.9.2.16/
Log:
Created branch for XULRunner 1.9.2.16
14 years, 11 months