JBoss Tools SVN: r42804 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-31 06:48:22 -0400 (Tue, 31 Jul 2012)
New Revision: 42804
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java
Log:
JBIDE-12385 to trunk
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java 2012-07-31 10:43:13 UTC (rev 42803)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java 2012-07-31 10:48:22 UTC (rev 42804)
@@ -212,9 +212,9 @@
// Using a different delta constructor here to force
// whether this child is added or removed.
return new ArchiveNodeDeltaImpl(this, impl, addedOrRemoved,
- (HashMap)impl.attributeChanges.clone(),
- (HashMap)impl.propertyChanges.clone(),
- (HashMap)impl.childChanges.clone());
+ impl.getAttributeChanges(),
+ impl.getPropertyChanges(),
+ impl.getChildChanges());
}
return child.getDelta();
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java 2012-07-31 10:43:13 UTC (rev 42803)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java 2012-07-31 10:48:22 UTC (rev 42804)
@@ -41,11 +41,24 @@
protected ArrayList<ArchiveNodeImpl> children;
// cached data for deltas
- protected HashMap<String, NodeDelta> attributeChanges;
- protected HashMap<String, NodeDelta> propertyChanges;
- protected HashMap<IArchiveNode, Integer> childChanges;
+ private HashMap<String, NodeDelta> attributeChanges;
+ public synchronized HashMap<String, NodeDelta> getAttributeChanges() {
+ return (HashMap<String, NodeDelta>)attributeChanges.clone();
+ }
+ public synchronized HashMap<String, NodeDelta> getPropertyChanges() {
+ return (HashMap<String, NodeDelta>)propertyChanges.clone();
+ }
+ public synchronized HashMap<IArchiveNode, Integer> getChildChanges() {
+ return (HashMap<IArchiveNode, Integer>)childChanges.clone();
+ }
+
+
+ private HashMap<String, NodeDelta> propertyChanges;
+ private HashMap<IArchiveNode, Integer> childChanges;
+
+
public ArchiveNodeImpl (XbPackageNodeWithProperties delegate) {
nodeDelegate = delegate;
children = new ArrayList<ArchiveNodeImpl>();
@@ -260,7 +273,7 @@
* @param child
* @param addInDelegate
*/
- public final void addChild(IArchiveNode child, boolean addInDelegate) throws ArchivesModelException {
+ public synchronized final void addChild(IArchiveNode child, boolean addInDelegate) throws ArchivesModelException {
Assert.isNotNull(child);
ArchiveNodeImpl childImpl = (ArchiveNodeImpl) child;
children.add(childImpl);
@@ -302,7 +315,7 @@
* (non-Javadoc)
* @see org.jboss.ide.eclipse.archives.core.model.IArchiveNode#removeChild(org.jboss.ide.eclipse.archives.core.model.IArchiveNode)
*/
- public void removeChild(IArchiveNode node) {
+ public synchronized void removeChild(IArchiveNode node) {
Assert.isNotNull(node);
ArchiveNodeImpl impl = (ArchiveNodeImpl) node;
boolean removed = false;
@@ -322,64 +335,62 @@
/**
* An attribute has changed. Save the change so it can be represented in a delta
*/
- protected void attributeChanged(String key, Object beforeValue, Object afterValue) {
+ protected synchronized void attributeChanged(String key, Object beforeValue, Object afterValue) {
int kind = IArchiveNodeDelta.ATTRIBUTE_CHANGED;
- HashMap<String, NodeDelta> map = attributeChanges;
// short circuit if no change has REALLY occurred
if( beforeValue != null && beforeValue.equals(afterValue)) return;
- if( map.containsKey(key)) {
- Object original = map.get(key).getBefore();
+ if( attributeChanges.containsKey(key)) {
+ Object original = attributeChanges.get(key).getBefore();
if( original == null && afterValue == null )
- map.remove(key);
+ attributeChanges.remove(key);
else if( original == null )
- map.put(key, new NodeDelta(original, afterValue, kind));
+ attributeChanges.put(key, new NodeDelta(original, afterValue, kind));
else if( original.equals(afterValue))
// value was changed from x to y, then back to x. Therefore, no change
- map.remove(key);
+ attributeChanges.remove(key);
else
// value was changed from x to y to z.
// Before should remain x, after should become z
- map.put(key, new NodeDelta(original, afterValue, kind));
+ attributeChanges.put(key, new NodeDelta(original, afterValue, kind));
} else {
// added
- map.put(key, new NodeDelta(beforeValue, afterValue, kind));
+ attributeChanges.put(key, new NodeDelta(beforeValue, afterValue, kind));
}
}
/**
* A property has changed. Save the change so it can be represented in a delta
*/
- protected void propertyChanged(String key, Object beforeValue, Object afterValue) {
- HashMap<String, NodeDelta> changeMap = propertyChanges;
+ protected synchronized void propertyChanged(String key, Object beforeValue, Object afterValue) {
// short circuit if no change has REALLY occurred
if( beforeValue != null && beforeValue.equals(afterValue)) return;
- if( changeMap.containsKey(key)) {
+ if( propertyChanges.containsKey(key)) {
// element has already been added, removed, or changed since last save
- Object original = changeMap.get(key).getBefore();
+ Object original = propertyChanges.get(key).getBefore();
if( original == null && afterValue == null )
- changeMap.remove(key);
+ propertyChanges.remove(key);
else if( original == null )
- changeMap.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_ADDED));
+ propertyChanges.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_ADDED));
else if( original.equals(afterValue))
// value was changed from x to y, then back to x. Therefore, no change
- changeMap.remove(key);
+ propertyChanges.remove(key);
else if( afterValue == null ) {
// changed from x to y to null, so removed
- changeMap.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_REMOVED));
+ propertyChanges.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_REMOVED));
} else {
// changed from x to y to z, so changed
- changeMap.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_CHANGED));
+ propertyChanges.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_CHANGED));
}
} else {
int kind;
if( beforeValue == null ) kind = IArchiveNodeDelta.PROPERTY_ADDED;
else if( afterValue == null ) kind = IArchiveNodeDelta.PROPERTY_REMOVED;
else kind = IArchiveNodeDelta.PROPERTY_CHANGED;
- changeMap.put(key, new NodeDelta(beforeValue, afterValue, kind));
+ propertyChanges.put(key, new NodeDelta(beforeValue, afterValue, kind));
}
}
@@ -388,7 +399,7 @@
* @param node
* @param changeType
*/
- protected void childChanges(IArchiveNode node, int changeType) {
+ protected synchronized void childChanges(IArchiveNode node, int changeType) {
if( childChanges.containsKey(node)) {
int lastChange = childChanges.get(node).intValue();
if( lastChange == IArchiveNodeDelta.CHILD_ADDED && changeType == IArchiveNodeDelta.CHILD_REMOVED) {
@@ -406,14 +417,15 @@
* @see org.jboss.ide.eclipse.archives.core.model.IArchiveNode#getDelta()
*/
public IArchiveNodeDelta getDelta() {
- return new ArchiveNodeDeltaImpl(null, this, (HashMap<String, NodeDelta>)attributeChanges.clone(),
- (HashMap<String, NodeDelta>)propertyChanges.clone(), (HashMap<IArchiveNode, Integer>)childChanges.clone());
+ return new ArchiveNodeDeltaImpl(null, this, getAttributeChanges(),
+ getPropertyChanges(), getChildChanges());
}
+
/**
* Forget all past state
*/
- public void clearDelta() {
+ public synchronized void clearDelta() {
attributeChanges.clear();
propertyChanges.clear();
childChanges.clear();
13 years, 2 months
JBoss Tools SVN: r42803 - in trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test: defects and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-31 06:43:13 -0400 (Tue, 31 Jul 2012)
New Revision: 42803
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
Log:
JBIDE-12377 to trunk
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2012-07-31 10:40:06 UTC (rev 42802)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2012-07-31 10:43:13 UTC (rev 42803)
@@ -58,42 +58,42 @@
public static Test suite() {
ValidationFramework.getDefault().suspendAllValidation(true);
TestSuite suite = new TestSuite("ASTools Test Suite");
- suite.addTestSuite(ArgsUtilTest.class);
- suite.addTestSuite(ExpressionResolverUtilTest.class);
- suite.addTestSuite(PreReqTest.class);
- suite.addTestSuite(ServerBeanLoaderTest.class);
+// suite.addTestSuite(ArgsUtilTest.class);
+// suite.addTestSuite(ExpressionResolverUtilTest.class);
+// suite.addTestSuite(PreReqTest.class);
+// suite.addTestSuite(ServerBeanLoaderTest.class);
+//
+//
+// // Cannot find a way to run this test and pre-load the credentials for the keystore
+// //suite.addTestSuite(ServerSecureStorageTest.class);
+// suite.addTestSuite(RuntimeServerModelTest.class);
+// suite.addTestSuite(JEEClasspathContainerTest.class);
+// suite.addTestSuite(ProjectRuntimeTest.class);
+// suite.addTestSuite(JSTDeploymentWarUpdateXML.class);
+// suite.addTestSuite(SingleFileDeployableMockDeploymentTester.class);
+// suite.addTestSuite(XPathModelTest.class);
+// suite.addTestSuite(StringSubstitutionTest.class);
-
- // Cannot find a way to run this test and pre-load the credentials for the keystore
- //suite.addTestSuite(ServerSecureStorageTest.class);
- suite.addTestSuite(RuntimeServerModelTest.class);
- suite.addTestSuite(JEEClasspathContainerTest.class);
- suite.addTestSuite(ProjectRuntimeTest.class);
- suite.addTestSuite(JSTDeploymentWarUpdateXML.class);
- suite.addTestSuite(SingleFileDeployableMockDeploymentTester.class);
- suite.addTestSuite(XPathModelTest.class);
- suite.addTestSuite(StringSubstitutionTest.class);
-
// Publishing tests
suite.addTestSuite(DeployAndTempDeployFolderTest.class);
- suite.addTestSuite(BehaviourModelDefectTest.class);
- suite.addTestSuite(WebDeployableArtifactUtilDefectTest.class);
- suite.addTestSuite(MockJSTPublisherTest.class);
- suite.addTestSuite(MockJSTPublisherTestDynUtil.class);
- suite.addTestSuite(JBIDE1657Test.class);
- suite.addTestSuite(JBIDE2512aTest.class);
- suite.addTestSuite(JBIDE2512bTest.class);
- suite.addTestSuite(JBIDE4184Test.class);
- suite.addTestSuite(TestEar5WithJBossRuntime.class);
- suite.addTestSuite(JSTDeploymentTester.class);
- suite.addTestSuite(JSTDeployBinaryChildModuleTest.class);
- suite.addTestSuite(JSTModuleDeployFoldersTest.class);
- suite.addTestSuite(SingleFileDeploymentTester.class);
- suite.addTestSuite(JBossServerAPITest.class);
- suite.addTestSuite(Mock2FilterTest.class);
- suite.addTestSuite(PublishFilterDirectoryScannerTest.class);
- suite.addTestSuite(PublishingFilterTest.class);
-
+// suite.addTestSuite(BehaviourModelDefectTest.class);
+// suite.addTestSuite(WebDeployableArtifactUtilDefectTest.class);
+// suite.addTestSuite(MockJSTPublisherTest.class);
+// suite.addTestSuite(MockJSTPublisherTestDynUtil.class);
+// suite.addTestSuite(JBIDE1657Test.class);
+// suite.addTestSuite(JBIDE2512aTest.class);
+// suite.addTestSuite(JBIDE2512bTest.class);
+// suite.addTestSuite(JBIDE4184Test.class);
+// suite.addTestSuite(TestEar5WithJBossRuntime.class);
+// suite.addTestSuite(JSTDeploymentTester.class);
+// suite.addTestSuite(JSTDeployBinaryChildModuleTest.class);
+// suite.addTestSuite(JSTModuleDeployFoldersTest.class);
+// suite.addTestSuite(SingleFileDeploymentTester.class);
+// suite.addTestSuite(JBossServerAPITest.class);
+// suite.addTestSuite(Mock2FilterTest.class);
+// suite.addTestSuite(PublishFilterDirectoryScannerTest.class);
+// suite.addTestSuite(PublishingFilterTest.class);
+//
return suite;
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java 2012-07-31 10:40:06 UTC (rev 42802)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java 2012-07-31 10:43:13 UTC (rev 42803)
@@ -32,7 +32,11 @@
import org.jboss.tools.test.util.JobUtils;
public class WebDeployableArtifactUtilDefectTest extends TestCase {
- public void setUp() {
+ public void setUp() throws Exception {
+ ServerRuntimeUtils.deleteAllServers();
+ ServerRuntimeUtils.deleteAllRuntimes();
+ ProjectUtility.deleteAllProjects();
+ ASTest.clearStateLocation();
JobUtils.waitForIdle(2000);
}
public void tearDown() throws Exception {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java 2012-07-31 10:40:06 UTC (rev 42802)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java 2012-07-31 10:43:13 UTC (rev 42803)
@@ -10,8 +10,16 @@
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility;
+import org.jboss.tools.test.util.JobUtils;
public class DeployAndTempDeployFolderTest extends TestCase {
+ public void setUp() throws Exception {
+ ServerRuntimeUtils.deleteAllServers();
+ ServerRuntimeUtils.deleteAllRuntimes();
+ ProjectUtility.deleteAllProjects();
+ ASTest.clearStateLocation();
+ JobUtils.waitForIdle(2000);
+ }
public void tearDown() throws Exception {
ServerRuntimeUtils.deleteAllServers();
ServerRuntimeUtils.deleteAllRuntimes();
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2012-07-31 10:40:06 UTC (rev 42802)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2012-07-31 10:43:13 UTC (rev 42803)
@@ -17,7 +17,9 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.internal.ServerPlugin;
import org.eclipse.wst.server.core.internal.ServerPreferences;
import org.jboss.ide.eclipse.as.test.ASTest;
@@ -33,10 +35,14 @@
}
private boolean initial;
public void setUp() throws Exception {
- super.setUp();
initial = ServerPreferences.getInstance().isAutoPublishing();
ServerPreferences.getInstance().setAutoPublishing(false);
+ super.setUp();
+ IServerWorkingCopy wc = server.createWorkingCopy();
+ wc.setAttribute(Server.PROP_AUTO_PUBLISH_SETTING, Server.AUTO_PUBLISH_DISABLE);
+ server = wc.save(true, null);
}
+
public void tearDown() throws Exception {
super.tearDown();
ServerPreferences.getInstance().setAutoPublishing(initial);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2012-07-31 10:40:06 UTC (rev 42802)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2012-07-31 10:43:13 UTC (rev 42803)
@@ -27,9 +27,9 @@
public class MockJSTPublisherTest extends AbstractJSTDeploymentTester {
private boolean initialAutopublishVal;
public void setUp() throws Exception {
- super.setUp();
initialAutopublishVal = ServerPreferences.getInstance().isAutoPublishing();
ServerPreferences.getInstance().setAutoPublishing(false);
+ super.setUp();
}
public void tearDown() throws Exception {
super.tearDown();
@@ -48,7 +48,6 @@
public void testNormalLogic() throws CoreException, IOException, Exception {
- server = ServerRuntimeUtils.createMockDeployOnlyServer();
server = ServerRuntimeUtils.useMockPublishMethod(server);
IServerWorkingCopy wc = server.createWorkingCopy();
wc.setAttribute(Server.PROP_AUTO_PUBLISH_SETTING, Server.AUTO_PUBLISH_DISABLE);
@@ -60,16 +59,23 @@
theTest(false);
}
- public void testForced7Logic() throws CoreException, IOException, Exception {
- server = ServerRuntimeUtils.createMockJBoss7Server();
- server = ServerRuntimeUtils.useMockPublishMethod(server);
- project = createProject();
- MockPublishMethod.reset();
- theTest(true);
- }
+ /* There is no way to force as7 deployment onto a deploy-only server */
+// public void testForced7Logic() throws CoreException, IOException, Exception {
+// server = ServerRuntimeUtils.useMockPublishMethod(server);
+// IServerWorkingCopy wc = server.createWorkingCopy();
+// wc.setAttribute(Server.PROP_AUTO_PUBLISH_SETTING, Server.AUTO_PUBLISH_DISABLE);
+// server = wc.save(true, null);
+// JobUtils.waitForIdle(1000);
+// project = createProject();
+// JobUtils.waitForIdle(1000);
+// MockPublishMethod.reset();
+// theTest(true);
+// }
protected void theTest(boolean isAs7) throws CoreException, IOException {
- ServerPreferences.getInstance().setAutoPublishing(false);
+
+ JobUtils.delay(5000);
+ JobUtils.waitForIdle();
IModule mod = ServerUtil.getModule(project);
server = ServerRuntimeUtils.addModule(server, mod);
ServerRuntimeUtils.publish(server);
13 years, 2 months
JBoss Tools SVN: r42801 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: src/org/jboss/ide/eclipse/as/ui/bot/test and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-07-31 05:23:35 -0400 (Tue, 31 Jul 2012)
New Revision: 42801
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
Log:
Added tests for AS 4.2
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties 2012-07-31 09:23:35 UTC (rev 42801)
@@ -0,0 +1 @@
+SERVER=AS,4.2,default,${jboss-as-4.2}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-31 08:24:11 UTC (rev 42800)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -1,5 +1,9 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server;
@@ -23,16 +27,20 @@
CreateAS7Server.class,
CreateAS6Server.class,
CreateAS5Server.class,
+ CreateAS4Server.class,
OperateAS7Server.class,
OperateAS6Server.class,
OperateAS5Server.class,
+ OperateAS4Server.class,
DeployJSPProjectAS7Server.class,
DeployJSPProjectAS6Server.class,
DeployJSPProjectAS5Server.class,
+ DeployJSPProjectAS4Server.class,
HotDeployJSPFile.class,
UndeployJSPProjectAS7Server.class,
UndeployJSPProjectAS6Server.class,
UndeployJSPProjectAS5Server.class,
+ UndeployJSPProjectAS4Server.class,
DeleteServer.class
})
public class AllTestsSuite {
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Present))
+public class CreateAS4Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running))
+public class DeployJSPProjectAS4Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.NotRunning))
+public class OperateAS4Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS4Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-07-31 08:24:11 UTC (rev 42800)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -8,6 +8,7 @@
import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
import org.jboss.tools.ui.bot.ext.view.ServersView;
@@ -29,9 +30,9 @@
public abstract class DeployJSPProjectTemplate extends SWTTestExt {
public static final String PROJECT_NAME = "jsp-project";
-
+
protected abstract String getConsoleMessage();
-
+
@Before
public void importProject(){
ImportProjectWizard wizard = new ImportProjectWizard();
@@ -40,12 +41,15 @@
wizard.setProjectNames(PROJECT_NAME);
wizard.execute();
}
-
+
@Test
public void deployProject(){
ServersView serversView = new ServersView();
serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
-
+
+ // web
+ serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
+ assertThat("Hello tests!", new PageSourceMatcher());
// console
assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
assertThat("Exception:", not(new ConsoleOutputMatcher()));
@@ -53,8 +57,5 @@
assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
- // web
- serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
- assertThat("Hello tests!", new PageSourceMatcher());
}
}
13 years, 2 months
JBoss Tools SVN: r42800 - trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2012-07-31 04:24:11 -0400 (Tue, 31 Jul 2012)
New Revision: 42800
Modified:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
Log:
fix for compilation problems in
ws.jaxrs.core.WorkbenchUtils.java
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2012-07-31 07:39:47 UTC (rev 42799)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2012-07-31 08:24:11 UTC (rev 42800)
@@ -29,7 +29,8 @@
org.eclipse.core.commands;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
- org.eclipse.wst.validation;bundle-version="1.2.300"
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.apache.commons.io;bundle-version="2.0.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Eclipse-RegisterBuddy: org.apache.log4j
13 years, 2 months
JBoss Tools SVN: r42799 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2012-07-31 03:39:47 -0400 (Tue, 31 Jul 2012)
New Revision: 42799
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
Log:
https://issues.jboss.org/browse/JBIDE-11883
Fix ui messages problem and close progress monitor
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java 2012-07-31 04:47:44 UTC (rev 42798)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java 2012-07-31 07:39:47 UTC (rev 42799)
@@ -47,7 +47,7 @@
private List<IResource> javaFilesToAdd;
public AddGeneratedClassesJob(JpaProject jpaProject, List<IResource> javaFilesToAdd) {
- super(Messages.SYNC_CLASSES_JOB);
+ super(UIMessages.SYNC_CLASSES_JOB);
IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace().getRuleFactory();
setRule(ruleFactory.modifyRule(jpaProject.getProject()));
this.jpaProject = jpaProject;
@@ -59,7 +59,7 @@
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
- final SubMonitor sm = SubMonitor.convert(monitor, Messages.SYNC_CLASSES_TASK, 20);
+ final SubMonitor sm = SubMonitor.convert(monitor, UIMessages.SYNC_CLASSES_TASK, 20);
final JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
if (resource == null) {
//the resource would only be null if the persistence.xml file had an invalid content type
@@ -86,6 +86,7 @@
IStatus status = addNewClassRefs(sm.newChild(17), jpaProject, persistenceUnit);
resource.save();
+ sm.done();
return status;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2012-07-31 04:47:44 UTC (rev 42798)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2012-07-31 07:39:47 UTC (rev 42799)
@@ -45,9 +45,5 @@
public static final String NAME_CANT_BE_EMPTY = "NAME_CANT_BE_EMPTY";//$NON-NLS-1$
public static final String TYPE_DEF_DUPLICATE_NAME= "TYPE_DEF_DUPLICATE_NAME";//$NON-NLS-1$
-
- public static final String SYNC_CLASSES_JOB = "SYNC_CLASSES_JOB";//$NON-NLS-1$
-
- public static final String SYNC_CLASSES_TASK = "SYNC_CLASSES_TASK";//$NON-NLS-1$
}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java 2012-07-31 07:39:47 UTC (rev 42799)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.jpt.core.internal.context;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+public class UIMessages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.jpt.core.internal.context.Messages";//$NON-NLS-1$
+
+ public static String SYNC_CLASSES_JOB;
+
+ public static String SYNC_CLASSES_TASK;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, UIMessages.class);
+ }
+}
13 years, 2 months
JBoss Tools SVN: r42798 - in trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test: publishing and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-31 00:47:44 -0400 (Tue, 31 Jul 2012)
New Revision: 42798
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
Log:
JBIDE-12363 fixing old test suite
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java 2012-07-31 01:21:40 UTC (rev 42797)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects/WebDeployableArtifactUtilDefectTest.java 2012-07-31 04:47:44 UTC (rev 42798)
@@ -29,8 +29,12 @@
import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase;
import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil;
import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility;
+import org.jboss.tools.test.util.JobUtils;
public class WebDeployableArtifactUtilDefectTest extends TestCase {
+ public void setUp() {
+ JobUtils.waitForIdle(2000);
+ }
public void tearDown() throws Exception {
ServerRuntimeUtils.deleteAllServers();
ServerRuntimeUtils.deleteAllRuntimes();
@@ -56,6 +60,7 @@
}
public void testWebDeployableDefect() throws Exception {
+ JobUtils.waitForIdle();
IFile f = createProjectAndGetJavaIFile();
IModuleArtifact artifact = new WebDeployableArtifactUtil().getModuleObject(f);
if( artifact == null )
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java 2012-07-31 01:21:40 UTC (rev 42797)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/DeployAndTempDeployFolderTest.java 2012-07-31 04:47:44 UTC (rev 42798)
@@ -46,8 +46,8 @@
wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
s = wc.save(true, null);
IDeployableServer ds = ServerConverter.getDeployableServer(s);
- assertTrue("/home/test1".equals(ds.getDeployFolder()));
- assertTrue("/home/test2".equals(ds.getTempDeployFolder()));
+ assertEquals("/home/test1",ds.getDeployFolder());
+ assertEquals("/home/test2",ds.getTempDeployFolder());
}
public void testAS7xCustomRelative() throws CoreException {
@@ -56,8 +56,8 @@
wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
s = wc.save(true, null);
IDeployableServer ds = ServerConverter.getDeployableServer(s);
- assertTrue("/rtHome/home/test1".equals(ds.getDeployFolder()));
- assertTrue("/rtHome/home/test2".equals(ds.getTempDeployFolder()));
+ assertEquals("/rtHome/home/test1",ds.getDeployFolder());
+ assertEquals("/rtHome/home/test2",ds.getTempDeployFolder());
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2012-07-31 01:21:40 UTC (rev 42797)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2012-07-31 04:47:44 UTC (rev 42798)
@@ -31,6 +31,7 @@
import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase;
import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil;
import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility;
+import org.jboss.tools.test.util.JobUtils;
public class AbstractJSTDeploymentTester extends TestCase {
protected IProject project;
@@ -40,6 +41,7 @@
private final String TEXT_FILE = "test.txt";
private final IPath CONTENT_TEXT_FILE = new Path(CONTENT_DIR).append(TEXT_FILE);
public void setUp() throws Exception {
+ JobUtils.waitForIdle();
project = createProject();
server = ServerRuntimeUtils.createMockDeployOnlyServer();
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2012-07-31 01:21:40 UTC (rev 42797)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2012-07-31 04:47:44 UTC (rev 42798)
@@ -18,12 +18,31 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.eclipse.wst.server.core.internal.ServerPreferences;
+import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility;
+import org.jboss.ide.eclipse.as.ui.editor.ServerPasswordSection;
+import org.jboss.tools.test.util.JobUtils;
public class JSTDeploymentTester extends AbstractJSTDeploymentTester {
+ protected String getModuleName() {
+ return "JSTDeploymentTester5";
+ }
+ private boolean initial;
+ public void setUp() throws Exception {
+ super.setUp();
+ initial = ServerPreferences.getInstance().isAutoPublishing();
+ ServerPreferences.getInstance().setAutoPublishing(false);
+ }
+ public void tearDown() throws Exception {
+ super.tearDown();
+ ServerPreferences.getInstance().setAutoPublishing(initial);
+ }
+
-
public void testMain() throws CoreException, IOException {
IModule mod = ServerUtil.getModule(project);
IModule[] module = new IModule[] { mod };
@@ -31,6 +50,7 @@
server = ServerRuntimeUtils.addModule(server,mod);
ServerRuntimeUtils.publish(server);
IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
+ System.out.println(deployRoot.toOSString());
IPath rootFolder = deployRoot.append(getModuleName() + ".ear");
assertTrue(rootFolder.toFile().exists());
assertTrue(IOUtil.countFiles(rootFolder.toFile()) == 0);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2012-07-31 01:21:40 UTC (rev 42797)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2012-07-31 04:47:44 UTC (rev 42798)
@@ -16,19 +16,46 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.internal.ServerPreferences;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+import org.jboss.tools.test.util.JobUtils;
public class MockJSTPublisherTest extends AbstractJSTDeploymentTester {
+ private boolean initialAutopublishVal;
public void setUp() throws Exception {
+ super.setUp();
+ initialAutopublishVal = ServerPreferences.getInstance().isAutoPublishing();
+ ServerPreferences.getInstance().setAutoPublishing(false);
}
+ public void tearDown() throws Exception {
+ super.tearDown();
+ ServerPreferences.getInstance().setAutoPublishing(initialAutopublishVal);
+ }
+ private static int INDEX = 1;
+ private String MY_NAME = null;
+ protected String getModuleName() {
+ if( MY_NAME == null ) {
+ MY_NAME = "MockJSTPublisherTestModule" + INDEX;
+ INDEX++;
+ }
+ return MY_NAME;
+ }
+
+
public void testNormalLogic() throws CoreException, IOException, Exception {
server = ServerRuntimeUtils.createMockDeployOnlyServer();
server = ServerRuntimeUtils.useMockPublishMethod(server);
+ IServerWorkingCopy wc = server.createWorkingCopy();
+ wc.setAttribute(Server.PROP_AUTO_PUBLISH_SETTING, Server.AUTO_PUBLISH_DISABLE);
+ server = wc.save(true, null);
+ JobUtils.waitForIdle(1000);
project = createProject();
+ JobUtils.waitForIdle(1000);
MockPublishMethod.reset();
theTest(false);
}
@@ -48,13 +75,13 @@
ServerRuntimeUtils.publish(server);
assertChanged(
isAs7,
- new String[] { "newModule.ear", "newModule.ear/META-INF/application.xml" },
- new String[] { "newModule.ear", "newModule.ear/META-INF/application.xml", "newModule.ear.dodeploy" });
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear/META-INF/application.xml" },
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear/META-INF/application.xml", MY_NAME + ".ear.dodeploy" });
assertRemoved(
isAs7,
- new String[] { "newModule.ear" },
+ new String[] { MY_NAME + ".ear" },
// jst publisher always removes the prior deployed artifact since we could have switched from zipped to exploded
- new String[] { "newModule.ear", "newModule.ear.failed" });
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear.failed" });
MockPublishMethod.reset();
IFile textFile = project.getFile(getContentTextFilePath());
@@ -63,43 +90,44 @@
ServerRuntimeUtils.publish(server);
assertChanged(
isAs7,
- new String[] { "newModule.ear", "newModule.ear/test.txt" },
- new String[] { "newModule.ear", "newModule.ear/test.txt" });
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear/test.txt" },
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear/test.txt" });
assertRemoved(
isAs7,
- new String[] {}, new String[] { "newModule.ear.failed" });
+ new String[] {}, new String[] { MY_NAME + ".ear.failed" });
MockPublishMethod.reset();
IOUtil.setContents(textFile, 1);
ServerRuntimeUtils.publish(server);
assertChanged(
isAs7,
- new String[] { "newModule.ear", "newModule.ear/test.txt" },
- new String[] { "newModule.ear", "newModule.ear/test.txt" });
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear/test.txt" },
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear/test.txt" });
assertRemoved(
isAs7,
new String[] {},
- new String[] { "newModule.ear.failed" });
+ new String[] { MY_NAME + ".ear.failed" });
MockPublishMethod.reset();
textFile.delete(true, null);
ServerRuntimeUtils.publish(server);
assertRemoved(
isAs7,
- new String[] { "newModule.ear/test.txt" },
- new String[] { "newModule.ear.failed", "newModule.ear/test.txt" });
+ new String[] { MY_NAME + ".ear/test.txt" },
+ new String[] { MY_NAME + ".ear.failed", MY_NAME + ".ear/test.txt" });
assertChanged(
isAs7,
new String[] {},
new String[] {});
MockPublishMethod.reset();
+ IModule[] all = server.getModules();
server = ServerRuntimeUtils.removeModule(server, mod);
assertEquals(0, MockPublishMethod.getRemoved().length);
ServerRuntimeUtils.publish(server);
assertRemoved(
isAs7,
- new String[] { "newModule.ear" },
- new String[] { "newModule.ear", "newModule.ear.deployed", "newModule.ear.failed" });
+ new String[] { MY_NAME + ".ear" },
+ new String[] { MY_NAME + ".ear", MY_NAME + ".ear.deployed", MY_NAME + ".ear.failed" });
}
protected void assertRemoved(boolean isAs7, String[] nonAs7, String[] as7) {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-07-31 01:21:40 UTC (rev 42797)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-07-31 04:47:44 UTC (rev 42798)
@@ -34,7 +34,6 @@
public static ArrayList<IPath> tempFiles = new ArrayList<IPath>();
public static ArrayList<IModuleFile> copiedFiles = new ArrayList<IModuleFile>();
-
protected static String expectedRoot = MOCK_ROOT;
protected static String expectedTempRoot = MOCK_TEMP_ROOT;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2012-07-31 01:21:40 UTC (rev 42797)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2012-07-31 04:47:44 UTC (rev 42798)
@@ -55,6 +55,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.publishing.AbstractDeploymentTest;
+import org.jboss.tools.test.util.JobUtils;
import org.osgi.framework.Bundle;
public class ServerRuntimeUtils extends TestCase {
@@ -351,7 +352,9 @@
}
public static IStatus publish(int type, IServer server) throws CoreException {
- return server.publish(type, new NullProgressMonitor());
+ IStatus s = server.publish(type, new NullProgressMonitor());
+ JobUtils.waitForIdle(1000);
+ return s;
}
public static IServer setZipped(IServer server, boolean val) {
13 years, 2 months
JBoss Tools SVN: r42797 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-30 21:21:40 -0400 (Mon, 30 Jul 2012)
New Revision: 42797
Added:
trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.ent
trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.xml
Removed:
trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.ent
trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.ent
trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.xml
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Revision_History.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml
Log:
updated for JBDS 5.0.2 release
Deleted: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.ent
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.ent 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.ent 2012-07-31 01:21:40 UTC (rev 42797)
@@ -1,4 +0,0 @@
-<!ENTITY PRODUCT "JBoss Developer Studio">
-<!ENTITY BOOKID "5.0.0_Release_Notes">
-<!ENTITY YEAR "2012">
-<!ENTITY HOLDER "Red Hat">
Deleted: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.0_Release_Notes.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<!-- This article will dsplay the release notes for version 4.0.0, and be found at http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/4.0/html-single/... -->
-
-<article>
- <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
- </xi:include>
- <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</article>
Deleted: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.ent
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.ent 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.ent 2012-07-31 01:21:40 UTC (rev 42797)
@@ -1,4 +0,0 @@
-<!ENTITY PRODUCT "JBoss Developer Studio">
-<!ENTITY BOOKID "5.0.1_Release_Notes">
-<!ENTITY YEAR "2012">
-<!ENTITY HOLDER "Red Hat">
Deleted: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.1_Release_Notes.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<article>
- <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<!-- <xi:include href="Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
-</xi:include> -->
- <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<!-- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</article>
Added: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.ent
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.ent (rev 0)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.ent 2012-07-31 01:21:40 UTC (rev 42797)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "JBoss Developer Studio">
+<!ENTITY BOOKID "5.0.2_Release_Notes">
+<!ENTITY YEAR "2012">
+<!ENTITY HOLDER "Red Hat">
Property changes on: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.ent
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.xml (rev 0)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<article>
+ <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Component_Versions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!-- <xi:include href="Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
+</xi:include> -->
+ <xi:include href="Fixed_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!-- <xi:include href="Known_Issues.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</article>
Property changes on: trunk/documentation/guides/JBDS_Release_Notes/en-US/5.0.2_Release_Notes.xml
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -3,12 +3,12 @@
<!-- Modify the title tag to change which book will be built -->
<articleinfo>
- <title>5.0.1 Release Notes</title>
+ <title>5.0.2 Release Notes</title>
<subtitle>Information about the changes made for this release of the JBoss Developer Studio.</subtitle>
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
- <edition>5.0.1</edition>
- <pubsnumber>4</pubsnumber>
+ <edition>5.0.2</edition>
+ <pubsnumber>1</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -12,7 +12,7 @@
</listitem>
<listitem>
<para>
- JBoss Tools 3.3.1.Final
+ JBoss Tools 3.3.2.Final
</para>
</listitem>
</itemizedlist>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -1,81 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<section id="Issues-fixed-in-this-release">
<title>
- Enhancements and fixed issues in version 5.0.1
+ Enhancements and fixed issues in version 5.0.2
</title>
- <variablelist>
- <!-- JBIDE-12177 -->
- <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/jira/browse/JBIDE-12177">JBIDE-12177</ulink>
- </term>
- <listitem>
- <para>
- The feature to auto-complete code tags was broken in the Visual Editor. When attempting to auto-complete a code tag, invalid code would be generated. This has been corrected by modifying the content assist file XmlTagCompletionProposalComputer.java to ensure partner code tags are generated correctly when using auto-completion.
- </para>
- </listitem>
- </varlistentry>
-
- <!-- JBIDE-12158 -->
- <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/jira/browse/JBIDE-12158">JBIDE-12158</ulink>
- </term>
- <listitem>
- <para>
- An issue existed when creating a Dynamic Web Project and modifying the project to include the JBoss Core Portlet facet to the project. The portlet-api library was not detected in the target runtime, forcing the user to manually specify it via the user library. This has been corrected by adding the option, Portlet Target Runtime Provider, to the combo-box on the JBoss Portlet Capabilities wizard page.
- </para>
- </listitem>
-</varlistentry>
- <!-- JBIDE-12111 -->
- <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/jira/browse/JBIDE-12111">JBIDE-12111</ulink>
- </term>
- <listitem>
- <para>
- The version of Java to be used was hard coded in the pom.xml file of Maven projects. This caused errors when adding Maven configuration to a Seam 2.3 project since Maven projects were created to use Java 1.5, however Seam 2.3 requires Java 1.6. Maven tooling has been updated to allow the maven-compiler-plugin settings that are in the parent project to be dynamically inferred from the converted web project's original settings. This ensures the correct Java version is retained when Maven integration is added to an existing project.
- </para>
- </listitem>
- </varlistentry>
-
- <!-- JBIDE-12071 -->
- <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/jira/browse/JBIDE-12071">JBIDE-12071</ulink>
- </term>
- <listitem>
- <para>
- Previously, when a user performed a drag-and-drop action to publish a project it was ignored. This occurred because the code to publish a project only accepted direct user-initiated actions and not those considered to be a shell action. The ExpressPublishMethod.java and ExpressBehaviour.java files have been updated to handle shell actions correctly. As a result, incremental publishes initiated by the user are now also handled correctly.
- </para>
- </listitem>
- </varlistentry>
-
- <!-- JBIDE-12046 -->
- <varlistentry>
- <term>
- <ulink url="https://issues.jboss.org/jira/browse/JBIDE-12046">JBIDE-12046</ulink>
- </term>
- <listitem>
- <para>
- When a user tried to start or deploy to a remote server that was no longer reachable, various errors would be returned, however no adequate description of the issue was communicated. This issue has been resolved by returning a descriptive error when the remote server is unreachable and checking for file system responsiveness before attempting to publish.
- </para>
- </listitem>
- </varlistentry>
-
- <!-- JBIDE-11310 -->
- <varlistentry>
- <term><ulink url="https://issues.jboss.org/jira/browse/JBIDE-11310">JBIDE-11310</ulink></term>
- <listitem>
- <para>
- An issue in the OpenShift tooling meant that if a user logged into OpenShift and created an application, then went back to the login screen and signed in as a different user, the previous application parameters would still be available. This meant the second user was not able to create an application with the same parameters, and was also able to view what the previous user had created, causing a potential security issue. OpenShift tooling has been updated to reset when a new user connects, triggering a refresh of the targets and parameters.
- </para>
- </listitem>
- </varlistentry>
-
-</variablelist>
-
-
-
</section>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<section id="Known_Issues_with_this_release">
<title>
- Known Issues in version 5.0.1
+ Known Issues in version 5.0.2
</title>
<!-- <para>
There were no known issues at the time of release.
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -2,11 +2,11 @@
<section id="Overview">
<title>Overview</title>
<para>
- JBoss Developer Studio 5.0.1 is a minor release of the Eclipse based IDE developed and supported by Red Hat (the visual tooling components are supported for 3 years, and the runtime platform for 5 years). The IDE, which is available for Windows, Linux and OS X, provides tooling that allows for rapid Web 2.0 application development on the JBoss Enterprise Application Platform.
+ JBoss Developer Studio 5.0.2 is a minor release of the Eclipse based IDE developed and supported by Red Hat (the visual tooling components are supported for 3 years, and the runtime platform for 5 years). The IDE, which is available for Windows, Linux and OS X, provides tooling that allows for rapid Web 2.0 application development on the JBoss Enterprise Application Platform.
</para>
<para>
- JBoss Developer Studio 5.0.1 corrects bugs and adds enhancements to the 5.0.0 release.
+ JBoss Developer Studio 5.0.2 corrects bugs and adds enhancements to the 5.0.1 release.
</para>
<!-- <itemizedlist>
<listitem>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Revision_History.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Revision_History.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Revision_History.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -6,7 +6,7 @@
<revhistory>
<revision>
<revnumber>1-0</revnumber>
- <date>Wed Jul 04 2012</date>
+ <date>Tue Jul 31 2012</date>
<author>
<firstname>Isaac</firstname>
<surname>Rooskov</surname>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2012-07-31 01:06:55 UTC (rev 42796)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2012-07-31 01:21:40 UTC (rev 42797)
@@ -21,11 +21,11 @@
<email>irooskov(a)redhat.com</email>
</author>
<copyright>
- <year>2011</year>
+ <year>2012</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.3.1.Final
+ Version: 3.3.2.Final
</releaseinfo>
13 years, 2 months
JBoss Tools SVN: r42796 - in tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US: images/preferences and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-30 21:06:55 -0400 (Mon, 30 Jul 2012)
New Revision: 42796
Modified:
tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/Book_Info.xml
tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/images/preferences/preferences_7.png
tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/images/visual_page/visual_page_9.png
tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/preferences.xml
Log:
updated with 3.3.1 content
Modified: tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-31 00:17:58 UTC (rev 42795)
+++ tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/Book_Info.xml 2012-07-31 01:06:55 UTC (rev 42796)
@@ -6,8 +6,8 @@
<subtitle>Provides information relating to the Visual Web Tools module.</subtitle>
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
-<edition>5.0.0</edition>
-<pubsnumber>13</pubsnumber>
+<edition>5.0.1</edition>
+<pubsnumber>14</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
Modified: tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/images/preferences/preferences_7.png
===================================================================
(Binary files differ)
Modified: tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/images/visual_page/visual_page_9.png
===================================================================
(Binary files differ)
Modified: tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/preferences.xml
===================================================================
--- tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/preferences.xml 2012-07-31 00:17:58 UTC (rev 42795)
+++ tags/jbosstools-3.3.1.Final/jsf/docs/userguide/en-US/preferences.xml 2012-07-31 01:06:55 UTC (rev 42796)
@@ -139,11 +139,11 @@
</para>
</listitem>
- <listitem>
+ <!-- <listitem>
<para>
<xref linkend="Verification"/>
</para>
- </listitem>
+ </listitem> -->
</itemizedlist>
<para>
@@ -1364,7 +1364,7 @@
</figure>
</section>
- <section id="Verification">
+<!-- <section id="Verification">
<?dbhtml filename="Verification.html"?>
<title>Verification</title>
<para>
@@ -1396,7 +1396,7 @@
</imageobject>
</mediaobject>
</figure>
- </section>
+</section> -->
<section id="JBossServerPreferences">
<?dbhtml filename="View.html"?>
13 years, 2 months
JBoss Tools SVN: r42795 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2012-07-30 20:17:58 -0400 (Mon, 30 Jul 2012)
New Revision: 42795
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
Log:
Make Quick Fix "Add tag library definition" work with KB Model instead of using plain tag library list https://issues.jboss.org/browse/JBIDE-12304
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java 2012-07-31 00:14:41 UTC (rev 42794)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/AddTLDMarkerResolution.java 2012-07-31 00:17:58 UTC (rev 42795)
@@ -99,6 +99,9 @@
if(!JSPProblemMarkerResolutionGenerator.validatePrefix(file, start, prefix)){
return;
}
+ if(!JSPProblemMarkerResolutionGenerator.validateURI(file, start, uri)){
+ return;
+ }
FileEditorInput input = new FileEditorInput(file);
IDocumentProvider provider = DocumentProviderRegistry.getDefault().getDocumentProvider(input);
@@ -139,6 +142,9 @@
if(!JSPProblemMarkerResolutionGenerator.validatePrefix(file, start, prefix)){
return;
}
+ if(!JSPProblemMarkerResolutionGenerator.validateURI(file, start, uri)){
+ return;
+ }
Properties properties = getProperties();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-31 00:14:41 UTC (rev 42794)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-31 00:17:58 UTC (rev 42795)
@@ -81,6 +81,23 @@
return true;
}
+ public static boolean validateURI(IFile file, int start, String uri){
+ ELContext context = PageContextFactory.createPageContext(file);
+ if(context instanceof XmlContextImpl){
+ Map<String, List<INameSpace>> nameSpaces = ((XmlContextImpl) context).getNameSpaces(start);
+ Iterator<List<INameSpace>> iterator = nameSpaces.values().iterator();
+ while(iterator.hasNext()){
+ List<INameSpace> list = iterator.next();
+ for(INameSpace ns : list){
+ if(uri.equals(ns.getURI())){
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+ }
+
private IJavaCompletionProposal[] isOurCase(Annotation annotation){
ArrayList<IJavaCompletionProposal> proposals = new ArrayList<IJavaCompletionProposal>();
if(!(annotation instanceof TemporaryAnnotation)){
@@ -132,7 +149,7 @@
if(ns != null && ns.getPrefix() != null && ns.getPrefix().equals(prefix)){
String uri = ns.getURI();
String resolutionName = getResolutionName(xmlDocument != null && xmlDocument.isXMLType(), true, prefix, uri);
- if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
+ if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null && validateURI(file, start, uri)){
proposals.add(new AddTLDMarkerResolution(file, resolutionName, start, end, uri, prefix));
names.add(resolutionName);
}
@@ -146,7 +163,7 @@
String uri = l.getURI();
String resolutionName = getResolutionName(xmlDocument != null && xmlDocument.isXMLType(), true, prefix, uri);
- if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
+ if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null && validateURI(file, start, uri)){
proposals.add(new AddTLDMarkerResolution(file, resolutionName, start, end, uri, prefix));
names.add(resolutionName);
}
@@ -209,7 +226,7 @@
if(ns != null && ns.getPrefix() != null && ns.getPrefix().equals(prefix)){
String uri = ns.getURI();
String resolutionName = getResolutionName(marker.getType().equals(HTML_VALIDATOR_MARKER) || marker.isSubtypeOf(HTML_VALIDATOR_MARKER), marker.getType().equals(JSP_VALIDATOR_MARKER) || marker.isSubtypeOf(JSP_VALIDATOR_MARKER), prefix, uri);
- if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
+ if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null && validateURI(file, start, uri)){
resolutions.add(new AddTLDMarkerResolution(file, resolutionName, start, end, uri, prefix));
names.add(resolutionName);
}
@@ -222,7 +239,7 @@
String uri = l.getURI();
String resolutionName = getResolutionName(marker.getType().equals(HTML_VALIDATOR_MARKER) || marker.isSubtypeOf(HTML_VALIDATOR_MARKER), marker.getType().equals(JSP_VALIDATOR_MARKER) || marker.isSubtypeOf(JSP_VALIDATOR_MARKER), prefix, uri);
- if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
+ if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null && validateURI(file, start, uri)){
resolutions.add(new AddTLDMarkerResolution(file, resolutionName, start, end, uri, prefix));
names.add(resolutionName);
}
13 years, 2 months
JBoss Tools SVN: r42793 - in tags/jbosstools-3.3.1.Final/maven/docs/reference: en-US and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-30 19:33:06 -0400 (Mon, 30 Jul 2012)
New Revision: 42793
Modified:
tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/Book_Info.xml
tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/adding_maven_support.xml
tags/jbosstools-3.3.1.Final/maven/docs/reference/pom.xml
Log:
updated with 3.3.1 content
Modified: tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/Book_Info.xml
===================================================================
--- tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/Book_Info.xml 2012-07-30 23:20:34 UTC (rev 42792)
+++ tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/Book_Info.xml 2012-07-30 23:33:06 UTC (rev 42793)
@@ -11,9 +11,9 @@
<productnumber>5.0</productnumber>
- <edition>5.0.0</edition>
+ <edition>5.0.1</edition>
- <pubsnumber>5</pubsnumber>
+ <pubsnumber>7</pubsnumber>
<abstract>
<para>
Modified: tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/adding_maven_support.xml
===================================================================
--- tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/adding_maven_support.xml 2012-07-30 23:20:34 UTC (rev 42792)
+++ tags/jbosstools-3.3.1.Final/maven/docs/reference/en-US/adding_maven_support.xml 2012-07-30 23:33:06 UTC (rev 42793)
@@ -17,9 +17,110 @@
</mediaobject>
</figure>
<para>
- Right-click on the project to bring up the context menu.
+ Right-click on the project to bring up the context menu and click on <guimenuitem>Properties</guimenuitem>.
</para>
+ <!-- Maven Facet option -->
<para>
+ From the <guilabel>Properties</guilabel> screen click on <guilabel>Project Facets</guilabel>.
+ </para>
+ <figure id="adding_maven_support_06">
+ <title>Project Facets screen</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_06.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The Project Facets properties screen.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Select <guilabel>JBoss Maven Integration</guilabel> from the facets list. You will notice that a <guibutton>Further configuration required</guibutton> button appears at the bottom of the screen.
+ </para>
+ <figure id="adding_maven_support_07">
+ <title>Maven Integration facet selected</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_07.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The Maven integration facet has been selected from the facets menu.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Click on the <guibutton>Further configuration required</guibutton> button and you can either modify or accept the default values for all fields. Click the <guibutton>OK</guibutton> button to return to the facets screen.
+ </para>
+ <figure id="adding_maven_support_08">
+ <title>Maven Integration facet settings</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_08.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Setting the configuration for Maven integration.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <guibutton>Further configuration required</guibutton> button has now changed to <guibutton>Further configuration available</guibutton>. Click the <guibutton>Apply</guibutton> button and then the <guibutton>OK</guibutton> button to complete the addition of Maven support to your project.
+ </para>
+ <figure id="adding_maven_support_09">
+ <title>Maven Integration facet configured</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_09.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The JBoss Maven Integration facet has now been configured for the project.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Maven support has been added to the project, and a new <filename>pom.xml</filename> file appears in the list of files for the project. This can be viewed in the <guilabel>Project Explorer</guilabel>.
+ </para>
+ <figure id="adding_maven_support_04">
+ <title>New pom.xml file</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_04.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The project now has a new pom.xml file, seen in the Project Explorer.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Double-click on the <filename>pom.xml</filename> file to view the settings associated with it. The settings here were set in the <guilabel>Further configuration required</guilabel> step, and can be edited from this <guilabel>Overview</guilabel> screen.
+ </para>
+ <para>
+ It is recommended that you change the <guilabel>Packaging</guilabel> option to <guimenuitem>pom</guimenuitem> to avoid any issues in expansion of the project with Maven modules in the future.
+ </para>
+ <figure id="adding_maven_support_05">
+ <title>Overview screen for pom.xml</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/adding_maven_support/adding_maven_support_05.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ The Overview screen for the new pom.xml file.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <!-- Convert to Maven Project option -->
+<!-- <para>
From the context menu navigate to <menuchoice><guimenuitem>Configure</guimenuitem><guimenuitem>Convert to Maven Project</guimenuitem></menuchoice>.
</para>
<figure id="adding_maven_support_01">
@@ -104,5 +205,5 @@
</phrase>
</textobject>
</mediaobject>
- </figure>
+ </figure> -->
</chapter>
\ No newline at end of file
Modified: tags/jbosstools-3.3.1.Final/maven/docs/reference/pom.xml
===================================================================
--- tags/jbosstools-3.3.1.Final/maven/docs/reference/pom.xml 2012-07-30 23:20:34 UTC (rev 42792)
+++ tags/jbosstools-3.3.1.Final/maven/docs/reference/pom.xml 2012-07-30 23:33:06 UTC (rev 42793)
@@ -10,8 +10,8 @@
<properties>
<translation>en-US</translation>
- <docname>Maven_Reference_Guide</docname>
- <bookname>Maven_Reference_Guide</bookname>
+ <docname>Maven_Tools_Reference_Guide</docname>
+ <bookname>Maven Tools Reference Guide</bookname>
</properties>
<profiles>
13 years, 2 months