JBoss Tools SVN: r31942 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-09 01:05:53 -0400 (Thu, 09 Jun 2011)
New Revision: 31942
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
Log:
JBIDE-9085 - as7 should now show custom options and not just non-editable fields.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-09 01:17:33 UTC (rev 31941)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-09 05:05:53 UTC (rev 31942)
@@ -18,6 +18,7 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
@@ -95,9 +96,13 @@
// }
public static boolean isJBoss7(IServer server) {
- return server.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70);
+ return isJBoss7(server.getServerType());
}
+ public static boolean isJBoss7(IServerType type) {
+ return type.getId().equals(IJBossToolingConstants.SERVER_AS_70);
+ }
+
public static void createStandardFolders(IServer server) {
// create metadata area
File location = JBossServerCorePlugin.getServerStateLocation(server).toFile();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-06-09 01:17:33 UTC (rev 31941)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-06-09 05:05:53 UTC (rev 31942)
@@ -19,7 +19,7 @@
import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant.IDeploymentPageCallback;
public class RSEDeploymentPageCallback implements IDeploymentPageCallback {
- public boolean metadataEnabled() {
+ public boolean metadataEnabled(IServerWorkingCopy copy) {
return false;
}
public String getServerLocation(IServerWorkingCopy wc) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-09 01:17:33 UTC (rev 31941)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-09 05:05:53 UTC (rev 31942)
@@ -53,6 +53,7 @@
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.ui.ServerUICore;
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
@@ -75,14 +76,16 @@
public class DeploymentModuleOptionCompositeAssistant implements PropertyChangeListener {
public static interface IDeploymentPageCallback {
- public boolean metadataEnabled();
+ public boolean metadataEnabled(IServerWorkingCopy copy);
public String getServerLocation(IServerWorkingCopy wc);
public String getServerConfigName(IServerWorkingCopy wc);
public void propertyChange(PropertyChangeEvent evt, DeploymentModuleOptionCompositeAssistant composite);
}
public static class LocalDeploymentPageCallback implements IDeploymentPageCallback {
- public boolean metadataEnabled() {
+ public boolean metadataEnabled(IServerWorkingCopy copy) {
+ if( ServerUtil.isJBoss7(copy.getServerType()))
+ return false;
return true;
}
@@ -344,8 +347,6 @@
boolean showRadios = true;
if( rt == null || rt.loadAdapter(IJBossServerRuntime.class, null) == null)
showRadios = false;
- if( ServerUtil.isJBoss7(getServer().getServer()))
- showRadios = false;
return showRadios;
}
public static interface IBrowseBehavior {
@@ -382,7 +383,7 @@
: serverRadio.getSelection() ? serverRadio : customRadio;
String mode = page.getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
- boolean metaEnabled = callbackMappings.get(mode).metadataEnabled();
+ boolean metaEnabled = callbackMappings.get(mode).metadataEnabled(page.getServer());
metadataRadio.setEnabled(metaEnabled);
}
@@ -797,7 +798,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if( getShowRadios() && evt.getPropertyName().equals( IDeployableServer.SERVER_MODE)) {
String mode = page.getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
- metadataRadio.setEnabled(callbackMappings.get(mode).metadataEnabled());
+ metadataRadio.setEnabled(callbackMappings.get(mode).metadataEnabled(page.getServer()));
// String originalDeployLocation = page.getServer().getOriginal().getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
// String wcDeployLocation = page.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
if(!metadataRadio.isEnabled() && metadataRadio.getSelection()) {
14 years, 10 months
JBoss Tools SVN: r31941 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-08 21:17:33 -0400 (Wed, 08 Jun 2011)
New Revision: 31941
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-8994 fix build.properties - remove cruft and add '.' so classes are included
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties 2011-06-09 01:13:03 UTC (rev 31940)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/build.properties 2011-06-09 01:17:33 UTC (rev 31941)
@@ -1,9 +1,6 @@
-jars.compile.order = .
source.. = src/
output.. = bin/
-bin.includes = about.html,\
- ChangeLog,\
- META-INF/
-src.includes = ChangeLog,\
+bin.includes = ChangeLog,\
about.html,\
- pom.xml
+ .,\
+ META-INF/
14 years, 10 months
JBoss Tools SVN: r31940 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: src/org/jboss/tools/cdi/seam/solder/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-08 21:13:03 -0400 (Wed, 08 Jun 2011)
New Revision: 31940
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
Log:
JBIDE-9067
https://issues.jboss.org/browse/JBIDE-9067
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric 2011-06-09 01:13:03 UTC (rev 31940)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+//@Veto
+@Durable
+@ConversationScoped
+//@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java 2011-06-09 01:08:30 UTC (rev 31939)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageLogger.java 2011-06-09 01:13:03 UTC (rev 31940)
@@ -11,4 +11,9 @@
/* Add metaddata to the message */
dispatcher.send(null);
}
+
+ @Inject
+ @Durable
+ MessageDispatcher durableDispatcher;
+
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-06-09 01:08:30 UTC (rev 31939)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-06-09 01:13:03 UTC (rev 31940)
@@ -26,6 +26,7 @@
TestSuite suiteAll = new TestSuite("CDI Solder Core Tests");
suiteAll.addTestSuite(GenericBeanTest.class);
+ suiteAll.addTestSuite(GenericBeanValidationTest.class);
suiteAll.addTestSuite(BeanNamingTest.class);
suiteAll.addTestSuite(VetoTest.class);
suiteAll.addTestSuite(ExactTest.class);
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-06-09 01:13:03 UTC (rev 31940)
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class GenericBeanValidationTest extends SeamSolderTest {
+
+ public GenericBeanValidationTest() {}
+
+ public void testRemovingGenericPointConfiguration() throws CoreException {
+ /*
+ * Injection point: in class MessageManager
+ * @Inject @Generic MessageQueue queue;
+ * There are 3 generic configuration points, two of them have same qualifier
+ * Assert that MessageLogger has error marker.
+ */
+ IFile file = project.getFile(new Path("src/org/jboss/generic2/MessageLogger.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+
+
+ /*
+ * Remove DurableQueueConfiguration.java with vetoed version.
+ * After that there are only 2 configurations, with different qualifiers.
+ */
+ removeFile("src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*");
+
+ /*
+ * Set original DurableQueueConfiguration.java back.
+ * After that there are only 2 configurations, with different qualifiers.
+ */
+ writeFile("src/org/jboss/generic2/DurableQueueConfiguration.original",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+ }
+
+ public void testDisablingGenericPointConfiguration() throws CoreException {
+ /*
+ * Injection point: in class MessageManager
+ * @Inject @Generic MessageQueue queue;
+ * There are 3 generic configuration points, two of them have same qualifier
+ * Assert that MessageLogger has error marker.
+ * in all cases bean is produced by MyGenericBean.createMyFirstBean()
+ */
+ IFile file = project.getFile(new Path("src/org/jboss/generic2/MessageLogger.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+
+
+ /*
+ * Replace DurableQueueConfiguration.java with not generic version.
+ * After that there are only 2 configurations.
+ */
+ writeFile("src/org/jboss/generic2/DurableQueueConfiguration.notgeneric",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*");
+
+ /*
+ * Set original DurableQueueConfiguration.java back.
+ * Assert that MessageLogger again has error marker.
+ */
+ writeFile("src/org/jboss/generic2/DurableQueueConfiguration.original",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+ }
+
+ void writeFile(String sourcePath, String targetPath) throws CoreException {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ try {
+ IFile target = project.getFile(new Path(targetPath));
+ IFile source = project.getFile(new Path(sourcePath));
+ assertTrue(source.exists());
+ if(!target.exists()) {
+ target.create(source.getContents(), true, new NullProgressMonitor());
+ } else {
+ target.setContents(source.getContents(), true, false, new NullProgressMonitor());
+ }
+ JobUtils.waitForIdle();
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+ }
+
+ void removeFile(String targetPath) throws CoreException {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ try {
+ IFile target = project.getFile(new Path(targetPath));
+ assertTrue(target.exists());
+ target.delete(true, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r31939 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-08 21:08:30 -0400 (Wed, 08 Jun 2011)
New Revision: 31939
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
bump m2e from 0.13 to 1.0; bump jdom from 1.0 to 1.1.1
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-06-09 00:42:57 UTC (rev 31938)
+++ trunk/build/target-platform/multiple.target 2011-06-09 01:08:30 UTC (rev 31939)
@@ -17,8 +17,8 @@
<repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/"/>
<!-- m2e 0.13 + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="0.13.0.201105260005"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201105260005"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201105121337"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
@@ -43,7 +43,7 @@
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
@@ -242,4 +242,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-06-09 00:42:57 UTC (rev 31938)
+++ trunk/build/target-platform/unified.target 2011-06-09 01:08:30 UTC (rev 31939)
@@ -17,8 +17,8 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
<!-- m2e 0.13 + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="0.13.0.201105260005"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201105260005"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201105121337"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
@@ -43,7 +43,7 @@
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
- <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
@@ -242,4 +242,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
14 years, 10 months
JBoss Tools SVN: r31938 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-08 20:42:57 -0400 (Wed, 08 Jun 2011)
New Revision: 31938
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-9067
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-09 00:18:08 UTC (rev 31937)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-09 00:42:57 UTC (rev 31938)
@@ -215,7 +215,7 @@
public IStatus validate(Set<IFile> changedFiles, IProject project, ContextValidationHelper validationHelper, IProjectValidationContext context, ValidatorManager manager, IReporter reporter)
throws ValidationException {
init(project, validationHelper, context, manager, reporter);
- displaySubtask(CDIValidationMessages.SEARCHING_RESOURCES);
+ displaySubtask(CDIValidationMessages.SEARCHING_RESOURCES, new String[]{project.getName()});
if (cdiProject == null) {
return OK_STATUS;
@@ -226,14 +226,12 @@
Dependencies ds = cdiProject.getNature().getDefinitions().getDependencies();
for(IFile file: changedFiles) {
Set<IPath> dd = ds.getDirectDependencies(file.getFullPath());
- if(dd != null && !dd.isEmpty()) {
+ if(dd != null) {
for (IPath p: dd) {
IFile f = root.getFile(p);
if(f != null && f.exists() && !changedFiles.contains(f)) {
resources.add(p);
- if(f.exists()) {
- collectAllRelatedInjections(f, resources);
- }
+ collectAllRelatedInjections(f, resources);
}
}
}
14 years, 10 months
JBoss Tools SVN: r31937 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.client.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-08 20:18:08 -0400 (Wed, 08 Jun 2011)
New Revision: 31937
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.client/build.properties
Log:
JBIDE-8994 remove fluff from build.properties file and ensure that '.' is included in the bin build
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.client/build.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.client/build.properties 2011-06-09 00:16:58 UTC (rev 31936)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.client/build.properties 2011-06-09 00:18:08 UTC (rev 31937)
@@ -1,8 +1,6 @@
-jars.compile.order = .
source.. = src/
output.. = bin/
-src.includes = about.html,\
- ChangeLog
bin.includes = ChangeLog,\
about.html,\
+ .,\
META-INF/
14 years, 10 months
JBoss Tools SVN: r31936 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-08 20:16:58 -0400 (Wed, 08 Jun 2011)
New Revision: 31936
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
JBIDE-9067
https://issues.jboss.org/browse/JBIDE-9067
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-09 00:08:42 UTC (rev 31935)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-09 00:16:58 UTC (rev 31936)
@@ -223,6 +223,22 @@
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
Set<IPath> resources = new HashSet<IPath>(); // Resources which we have
// to validate.
+ Dependencies ds = cdiProject.getNature().getDefinitions().getDependencies();
+ for(IFile file: changedFiles) {
+ Set<IPath> dd = ds.getDirectDependencies(file.getFullPath());
+ if(dd != null && !dd.isEmpty()) {
+ for (IPath p: dd) {
+ IFile f = root.getFile(p);
+ if(f != null && f.exists() && !changedFiles.contains(f)) {
+ resources.add(p);
+ if(f.exists()) {
+ collectAllRelatedInjections(f, resources);
+ }
+ }
+ }
+ }
+ }
+
for (IFile currentFile : changedFiles) {
if (reporter.isCancelled()) {
break;
@@ -283,21 +299,6 @@
// linked again during validation.
getValidationContext().removeLinkedCoreResources(SHORT_ID, resources);
- Dependencies ds = cdiProject.getNature().getDefinitions().getDependencies();
- Set<IFile> dependentFiles = new HashSet<IFile>();
- for(IFile file: filesToValidate) {
- Set<IPath> dd = ds.getDirectDependencies(file.getFullPath());
- if(dd != null && !dd.isEmpty()) {
- for (IPath p: dd) {
- IFile f = cdiProject.getNature().getProject().getParent().getFile(p);
- if(f != null && f.exists() && !filesToValidate.contains(f)) dependentFiles.add(f);
- }
- }
- }
- if(!dependentFiles.isEmpty()) {
- filesToValidate.addAll(dependentFiles);
- }
-
// We should remove markers from the source files at first
for(IFile file: filesToValidate) {
removeAllMessagesFromResource(file);
@@ -395,6 +396,22 @@
displaySubtask(CDIValidationMessages.VALIDATING_RESOURCE, new String[] {file.getProject().getName(), file.getName()});
coreHelper.getValidationContextManager().addValidatedProject(this, file.getProject());
+ Dependencies ds = cdiProject.getNature().getDefinitions().getDependencies();
+ Set<IPath> dd = ds.getDirectDependencies(file.getFullPath());
+ if(dd != null && !dd.isEmpty()) {
+ Set<IPath> resources = new HashSet<IPath>();
+ for (IPath p: dd) {
+ IFile f = cdiProject.getNature().getProject().getParent().getFile(p);
+ if(f.exists()) {
+ resources.add(p);
+ collectAllRelatedInjections(f, resources);
+ }
+ }
+ for (IPath p: resources) {
+ getValidationContext().addLinkedCoreResource(SHORT_ID, p.toOSString(), file.getFullPath(), false);
+ }
+ }
+
if("beans.xml".equalsIgnoreCase(file.getName()) && CDIPreferences.shouldValidateBeansXml(file.getProject())) {
// TODO should we check the path of the beans.xml? Or it's better to check the every beans.xml even if it is not in META-INF or WEB-INF.
beansXmlValidator.validateBeansXml(file);
14 years, 10 months
JBoss Tools SVN: r31935 - trunk/vpe/tests.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-06-08 20:08:42 -0400 (Wed, 08 Jun 2011)
New Revision: 31935
Modified:
trunk/vpe/tests/pom.xml
Log:
aded -debug -consolelog to see what is actually going on at testing time
Modified: trunk/vpe/tests/pom.xml
===================================================================
--- trunk/vpe/tests/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
+++ trunk/vpe/tests/pom.xml 2011-06-09 00:08:42 UTC (rev 31935)
@@ -30,7 +30,7 @@
<!-- default is 1800 sec = 30 min -->
<surefire.timeout>3600</surefire.timeout>
<forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
-
+ <appArgLine>-debug -consolelog</appArgLine>
<explodedBundles>
<bundle>org.jboss.tools.vpe</bundle>
<bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
14 years, 10 months
JBoss Tools SVN: r31934 - in trunk: jsf/tests/org.jboss.tools.jsf.test and 12 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-06-08 19:44:32 -0400 (Wed, 08 Jun 2011)
New Revision: 31934
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
trunk/jsf/tests/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
trunk/vpe/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8777
configuration problem is fixed for jsf tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -22,7 +22,7 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <explodedBundles>
+ <explodedBundles combine.children="append">
<bundle>org.jboss.tools.jsf.test</bundle>
</explodedBundles>
</configuration>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -15,17 +15,4 @@
<emma.filter>org.jboss.tools.jsf.ui*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.ui</emma.instrument.bundles>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <product>org.jboss.tools.tests.product</product>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -15,23 +15,4 @@
<emma.filter>org.jboss.tools.jsf.vpe.ajax4jsf*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.jsf.vpe.ajax4jsf</emma.instrument.bundles>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <explodedBundles>
- <bundle>org.jboss.tools.jsf.vpe.ajax4jsf</bundle>
- <bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
- </explodedBundles>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -23,14 +23,9 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
+ <explodedBundles combine.children="append">
<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
<bundle>org.jboss.tools.jsf.vpe.jsf.test</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
</explodedBundles>
</configuration>
</plugin>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -23,13 +23,8 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <explodedBundles>
+ <explodedBundles combine.children="append">
<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
- <bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
</explodedBundles>
</configuration>
</plugin>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -23,14 +23,9 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
+ <explodedBundles combine.children="append">
<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
<bundle>org.jboss.tools.jsf.vpe.seam</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
</explodedBundles>
</configuration>
</plugin>
Modified: trunk/jsf/tests/pom.xml
===================================================================
--- trunk/jsf/tests/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/jsf/tests/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -26,5 +26,27 @@
<module>org.jboss.tools.jsf.vpe.richfaces.test</module>
<module>org.jboss.tools.jsf.vpe.seam.test</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <product>org.jboss.tools.tests.product</product>
+ <!-- default is 1800 sec = 30 min -->
+ <surefire.timeout>3600</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
+
+ <explodedBundles>
+ <bundle>org.jboss.tools.vpe</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
+ </explodedBundles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -13,23 +13,4 @@
<properties>
<emma.filter>org.jboss.tools*</emma.filter>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <product>org.jboss.tools.tests</product>
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
- </explodedBundles>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -17,27 +17,4 @@
<emma.filter>org.jboss.tools.vpe.html*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.vpe.html</emma.instrument.bundles>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <product>org.jboss.tools.tests.product</product>
- <!-- default is 1800 sec = 30 min -->
- <surefire.timeout>3600</surefire.timeout>
- <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
-
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
- </explodedBundles>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -16,26 +16,4 @@
<emma.filter>org.jboss.tools.vpe*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.vpe</emma.instrument.bundles>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <!-- default is 1800 sec = 30 min -->
- <surefire.timeout>3600</surefire.timeout>
- <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
- <product>org.jboss.tools.tests</product>
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
- </explodedBundles>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -14,25 +14,4 @@
<properties>
<emma.filter>org.jboss.tools*</emma.filter>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <!-- default is 1800 sec = 30 min -->
- <surefire.timeout>3600</surefire.timeout>
- <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
- <product>org.jboss.tools.tests</product>
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
- </explodedBundles>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -23,26 +23,9 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
- <!-- default is 1800 sec = 30 min -->
- <surefire.timeout>3600</surefire.timeout>
- <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
- <product>org.jboss.tools.tests.product</product>
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
+ <explodedBundles combine.children="append">
<bundle>org.jboss.tools.vpe.ui.test</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
</explodedBundles>
- <dependencies>
- <dependency>
- <groupId>org.jboss.tools.vpe.plugins</groupId>
- <artifactId>org.jboss.tools.xulrunner.initializer</artifactId>
- <version>3.1.0</version>
- <type>eclipse-plugin</type>
- </dependency>
- </dependencies>
</configuration>
</plugin>
</plugins>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -16,34 +16,4 @@
<emma.filter>org.jboss.tools.vpe.xulrunner*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.vpe.xulrunner</emma.instrument.bundles>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <configuration>
- <!-- default is 1800 sec = 30 min -->
- <surefire.timeout>3600</surefire.timeout>
- <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
- <product>org.jboss.tools.tests</product>
- <explodedBundles>
- <bundle>org.jboss.tools.vpe</bundle>
- <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
- <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
- <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
- </explodedBundles>
- <dependencies>
- <dependency>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.xulrunner.initializer</artifactId>
- <version>3.1.0</version>
- <type>eclipse-plugin</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/vpe/tests/pom.xml
===================================================================
--- trunk/vpe/tests/pom.xml 2011-06-08 23:39:52 UTC (rev 31933)
+++ trunk/vpe/tests/pom.xml 2011-06-08 23:44:32 UTC (rev 31934)
@@ -20,4 +20,26 @@
<module>org.jboss.tools.vpe.ui.bot.test</module>
<module>org.jboss.tools.vpe.xulrunner.test</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <product>org.jboss.tools.tests.product</product>
+ <!-- default is 1800 sec = 30 min -->
+ <surefire.timeout>3600</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
+
+ <explodedBundles>
+ <bundle>org.jboss.tools.vpe</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
+ </explodedBundles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
14 years, 10 months
JBoss Tools SVN: r31933 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-08 19:39:52 -0400 (Wed, 08 Jun 2011)
New Revision: 31933
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
Log:
updated release notes with information about 'limits' when installing on Linux - and linking to Getting Started Guide for more installation information. JBIDE-8944
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-06-08 23:18:13 UTC (rev 31932)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-06-08 23:39:52 UTC (rev 31933)
@@ -6,6 +6,18 @@
<!-- <para>
The following list highlights new features that have been added to this release, as well as listing notable bug fixes. You can find a complete list of bug fixes <ulink url="https://issues.jboss.org/browse/JBIDE">here</ulink>.
</para> -->
+ <formalpara>
+ <title>BPEL</title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1610">JBDS-1610</ulink>: BPEL tooling is now supported as an additional tool for JBoss Developer Studio. Many bug fixes and enhancements have been applied to it in order to bring it from a technology preview to a supported component.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </formalpara>
<formalpara>
<title>Contexts and Dependency Injection (CDI)</title>
<para>
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-06-08 23:18:13 UTC (rev 31932)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-06-08 23:39:52 UTC (rev 31933)
@@ -19,7 +19,21 @@
</para>
</listitem>
</itemizedlist>
-
+ <important>
+ <para>
+ If you are installing on a Linux distribution you must set the following limits in <filename>/etc/security/limits.conf</filename> upon installation completion and before running JBoss Developer Studio:
+ </para>
+<programlisting>
+* soft nofile 9216
+* hard nofile 9216
+</programlisting>
+ <para>
+ These settings will ensure you do not encounter an error reguarding maximum open files when starting JBoss Developer Studio.
+ </para>
+ <para>
+ For further installation instructions see the Getting Started Guide for this release, available at: <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html</ulink>
+ </para>
+ </important>
<!-- Old 'new' feature list for JBDS 4.0.0 left as a guide -->
<!-- <itemizedlist>
<listitem>
14 years, 10 months