JBoss Tools SVN: r40396 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test: src/org/jboss/tools/jsf/text/ext/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-20 22:06:55 -0400 (Fri, 20 Apr 2012)
New Revision: 40396
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/elInTagBody.jsp
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/elInTagBody.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/elInTagBody.jsp 2012-04-21 00:44:57 UTC (rev 40395)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/jsfHyperlinkTests/WebContent/JBIDE-9930/elInTagBody.jsp 2012-04-21 02:06:55 UTC (rev 40396)
@@ -8,6 +8,7 @@
<body>
<f:view>
#{bean1.property1}
+ #{bean1['property1']}
</f:view>
</body>
</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java 2012-04-21 00:44:57 UTC (rev 40395)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkTestForELInTagBodyTest.java 2012-04-21 02:06:55 UTC (rev 40396)
@@ -40,11 +40,11 @@
PROJECT_NAME+"/WebContent/JBIDE-9930/anotherELInTagBody.jsp",
};
private static final String[][] TEXT_TO_FIND = new String [][] {
- {"bean1", "bean1.property1"},
+ {"bean1", "bean1.property1", "bean1['property1"},
{"msgs", "msgs.greeting"}
};
private static final String[][] RESULT_EDITORS = new String [][] {
- {"Bean1.java", "Bean1.java"},
+ {"Bean1.java", "Bean1.java", "Bean1.java"},
{"resources.properties", "resources.properties"}
};
@@ -74,7 +74,7 @@
public void testJSPELHyperlinkTestForELInTagBody() throws PartInitException, BadLocationException {
try {
for (int i = 0; i < PAGE_NAMES.length; i++) {
- for (int j = 0; j < TEXT_TO_FIND.length; j++) {
+ for (int j = 0; j < TEXT_TO_FIND[i].length; j++) {
doJSPELHyperlinkTestForELInTagBodyTest(PAGE_NAMES[i], TEXT_TO_FIND[i][j], RESULT_EDITORS[i][j]);
}
}
13 years, 8 months
JBoss Tools SVN: r40395 - in trunk/jsf/tests/org.jboss.tools.jsf.test: src/org/jboss/tools/jsf/test/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-20 20:44:57 -0400 (Fri, 20 Apr 2012)
New Revision: 40395
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/inputname.jsp
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/inputname.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/inputname.jsp 2012-04-20 23:12:56 UTC (rev 40394)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStartOldFormat/WebContent/pages/inputname.jsp 2012-04-21 00:44:57 UTC (rev 40395)
@@ -16,6 +16,8 @@
</h:inputText>
<h:commandButton id="submit" action="greeting" value="Say Hello" />
</h:form>
+ <h:outputText value="#{second['age']}"/>
+ <h:outputText value="#{second['age1']}"/>
</f:view>
</body>
</HTML>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-04-20 23:12:56 UTC (rev 40394)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2012-04-21 00:44:57 UTC (rev 40395)
@@ -44,6 +44,19 @@
// JobUtils.waitForIdle();
}
+ public void testPropertyInBrackets() throws CoreException, ValidationException {
+ assertMarkerIsCreatedForLine(
+ "WebContent/pages/inputname.jsp",
+ ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME,
+ new Object[] {"'age1'"},
+ 20);
+ assertMarkerIsNotCreatedForLine(
+ "WebContent/pages/inputname.jsp",
+ ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME,
+ new Object[] {"'age'"},
+ 19);
+ }
+
public void testUnknownELVariable() throws CoreException, ValidationException {
IPreferenceStore store = WebKbPlugin.getDefault().getPreferenceStore();
store.setValue(ELSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, ELSeverityPreferences.ENABLE);
13 years, 8 months
JBoss Tools SVN: r40394 - in trunk/maven/plugins/org.jboss.tools.maven.gwt: src/org/jboss/tools/maven/gwt and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-04-20 19:12:56 -0400 (Fri, 20 Apr 2012)
New Revision: 40394
Modified:
trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java
Log:
Ensure GWT tooling and m2e-wtp are configured for same output directory https://issues.jboss.org/browse/JBIDE-11224
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-04-20 18:56:51 UTC (rev 40393)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-04-20 23:12:56 UTC (rev 40394)
@@ -13,7 +13,8 @@
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)",
org.eclipse.jface;bundle-version="3.7.0",
org.jboss.tools.maven.ui;bundle-version="1.3.0",
- org.eclipse.ui;bundle-version="3.7.0"
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.jboss.tools.common.model;bundle-version="3.3.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.tools.maven.gwt
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-20 18:56:51 UTC (rev 40393)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-20 23:12:56 UTC (rev 40394)
@@ -10,30 +10,34 @@
******************************************************************************/
package org.jboss.tools.maven.gwt;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.MojoExecution;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
+import org.jboss.tools.common.model.project.ProjectHome;
import org.jboss.tools.maven.ui.Activator;
import org.osgi.service.prefs.BackingStoreException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.gdt.eclipse.core.properties.WebAppProjectProperties;
import com.google.gwt.eclipse.core.modules.IModule;
import com.google.gwt.eclipse.core.modules.ModuleUtils;
import com.google.gwt.eclipse.core.properties.GWTProjectProperties;
public class GWTProjectConfigurator extends AbstractProjectConfigurator {
-
private static final Logger log = LoggerFactory.getLogger(GWTProjectConfigurator.class);
public static final String GWT_WAR_MAVEN_PLUGIN_KEY = "org.codehaus.mojo:gwt-maven-plugin";
@@ -58,11 +62,38 @@
try {
GWTProjectProperties.setEntryPointModules(projectConfig.getProject(), modNames);
} catch (BackingStoreException e) {
- log.error("Exception in Maven GWT Configurator", e);
+ logError("Exception in Maven GWT Configurator, cannot set entry point modules", e);
}
+
+ try {
+ IPath webContentPath = getWebContentFolder(projectConfig.getProject(), monitor);
+ IFolder outputWorkspaceFolder = projectConfig.getProject().getWorkspace().getRoot().getFolder(webContentPath);
+ WebAppProjectProperties.setLastUsedWarOutLocation(projectConfig.getProject(), outputWorkspaceFolder.getFullPath());
+ } catch (BackingStoreException e) {
+ logError("Exception in Maven GWT Configurator, cannot set war output location", e);
+ }
+
} else {
log.debug("Skip configurator for non Java project {}",projectName);
}
}
}
+
+ /**
+ * Report error in logger and eclipse user interface
+ * @param message - exception context description
+ * @param e - exception to report
+ */
+ private void logError(final String message, BackingStoreException e) {
+ log.error(message, e);
+ MavenGWTPlugin.log(message,e);
+ }
+
+ private IPath getWebContentFolder(IProject project, IProgressMonitor monitor) throws CoreException {
+ IPath webContentPath = ProjectHome.getFirstWebContentPath(project);
+ Assert.isTrue(webContentPath != null && !webContentPath.isEmpty(),
+ MessageFormat
+ .format("No web content folder was found in project {0}", project.getName()));
+ return webContentPath;
+ }
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java 2012-04-20 18:56:51 UTC (rev 40393)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/MavenGWTPlugin.java 2012-04-20 23:12:56 UTC (rev 40394)
@@ -10,8 +10,12 @@
******************************************************************************/
package org.jboss.tools.maven.gwt;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.service.prefs.BackingStoreException;
public class MavenGWTPlugin implements BundleActivator {
@@ -37,4 +41,8 @@
MavenGWTPlugin.context = null;
}
+ public static void log(String message, BackingStoreException e) {
+ Platform.getLog(MavenGWTPlugin.getContext().getBundle()).log(new Status(IStatus.ERROR,context.getBundle().getSymbolicName(),message));
+ }
+
}
13 years, 8 months
JBoss Tools SVN: r40393 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-20 14:56:51 -0400 (Fri, 20 Apr 2012)
New Revision: 40393
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11596 compile failed in org.jboss.tools.jsf.ui.test when run against Juno TP
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2012-04-20 18:42:36 UTC (rev 40392)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2012-04-20 18:56:51 UTC (rev 40393)
@@ -1,5 +1,8 @@
package org.jboss.tools.jsf.ui.test;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -8,16 +11,17 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jst.jsp.ui.internal.validation.JSPContentSourceValidator;
import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.wst.html.internal.validation.HTMLValidator;
import org.eclipse.wst.validation.ValidationResult;
import org.eclipse.wst.validation.ValidationState;
import org.eclipse.wst.validation.internal.MarkerManager;
import org.eclipse.wst.validation.internal.core.Message;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jst.web.ui.action.JSPProblemMarkerResolutionGenerator;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -41,7 +45,7 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject("test_jsf_project");
}
- private void validate(IFile file) throws CoreException{
+ private void validate(IFile file) throws CoreException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, InstantiationException{
MarkerManager manager = MarkerManager.getDefault();
if(JSP_EXT.equals(file.getFileExtension())){
@@ -70,11 +74,27 @@
}
}else if(XHTML_EXT.equals(file.getFileExtension())){
file.deleteMarkers(XHTML_MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- HTMLValidator validator = new HTMLValidator();
-
- ValidationResult result = validator.validate(file, 0, new ValidationState(), new NullProgressMonitor());
-
+
+ // https://issues.jboss.org/browse/JBIDE-11596 compile failed in org.jboss.tools.jsf.ui.test when run against Juno TP
+ // org.eclipse.wst.html.internal.validation.HTMLValidator was moved to org.eclipse.wst.html.core.internal.validation.HTMLValidator
+ // We have to use reflection to be compilable in both Indigo and June.
+// org.eclipse.wst.html.internal.validation.HTMLValidator validator = new org.eclipse.wst.html.internal.validation.HTMLValidator();
+// ValidationResult result = validator.validate(file, 0, new ValidationState(), new NullProgressMonitor());
+ Class validatorClass = null;
+ try {
+ validatorClass = JsfUiPlugin.getDefault().getBundle().loadClass("org.eclipse.wst.html.internal.validation.HTMLValidator");
+ } catch (ClassNotFoundException e) {
+ try {
+ validatorClass = JsfUiPlugin.getDefault().getBundle().loadClass("org.eclipse.wst.html.core.internal.validation.HTMLValidator");
+ } catch (ClassNotFoundException e1) {
+ fail("Cannot load org.eclipse.wst.html.internal.validation.HTMLValidator (Eclipse Indigo) nor org.eclipse.wst.html.core.internal.validation.HTMLValidator (Eclipse Juno): ClassNotFoundException");
+ }
+ }
+ Constructor constructor = validatorClass.getConstructor();
+ Object validator = constructor.newInstance();
+ Method validate = validatorClass.getMethod("validate", IResource.class, int.class, ValidationState.class, IProgressMonitor.class);
+ ValidationResult result = (ValidationResult)validate.invoke(validator, file, 0, new ValidationState(), new NullProgressMonitor());
+
IReporter reporter = result.getReporter(new NullProgressMonitor());
List messages = reporter.getMessages();
for(Object m : messages){
@@ -96,7 +116,7 @@
}
}
- public void testProblemMarkerResolutionInJSP() throws CoreException {
+ public void testProblemMarkerResolutionInJSP() throws CoreException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, InstantiationException {
IFile jspFile = project.getFile("WebContent/pages/test_page1.jsp");
assertTrue("File must be exists.",jspFile.exists());
@@ -124,7 +144,7 @@
assertMarkerIsNotCreated(jspFile, JSP_MARKER_TYPE, "Unknown tag (h:commandButton).");
}
- public void testProblemMarkerResolutionInXHTML() throws CoreException {
+ public void testProblemMarkerResolutionInXHTML() throws CoreException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, InstantiationException {
IFile jspFile = project.getFile("WebContent/pages/test_page2.xhtml");
assertTrue("File must be exists.",jspFile.exists());
13 years, 8 months
JBoss Tools SVN: r40392 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-20 14:42:36 -0400 (Fri, 20 Apr 2012)
New Revision: 40392
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2012-04-20 18:42:08 UTC (rev 40391)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2012-04-20 18:42:36 UTC (rev 40392)
@@ -52,4 +52,11 @@
checkProposals(PAGE_NAME, text, text.length(), beans, false);
}
+
+ public void testCAForPropertiesInBrakets() {
+ String[] properties = {"mybean2['100", "mybean2['101"};
+
+ String text = "#{mybean2['10']}";
+ checkProposals(PAGE_NAME, text, 13, properties, false);
+ }
}
13 years, 8 months
JBoss Tools SVN: r40391 - trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-20 14:42:08 -0400 (Fri, 20 Apr 2012)
New Revision: 40391
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java 2012-04-20 18:14:36 UTC (rev 40390)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean3.java 2012-04-20 18:42:08 UTC (rev 40391)
@@ -4,5 +4,13 @@
@ManagedBean(name="mybean2")
public class Bean3 {
+
+ public String get100() {
+ return "100";
+ }
+ public String get101() {
+ return "101";
+ }
+
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-04-20 18:14:36 UTC (rev 40390)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-04-20 18:42:08 UTC (rev 40391)
@@ -7,6 +7,7 @@
<f:loadBundle basename="demo.resources2" var="mmm"/>
<h:outputText value="#{myb}"/>
-<h:outputText value="#{mybean1}"/>
-<h:outputText value="#{testA.addB(testB.addA(testA.addB(testB.addA())))}"/>
+<h:outputText value="#{mybean1}"/>
+<h:outputText value="#{testA.addB(testB.addA(testA.addB(testB.addA())))}"/>
+<h:outputText value="#{mybean2['10']}"/>
</html>
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r40390 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-20 14:14:36 -0400 (Fri, 20 Apr 2012)
New Revision: 40390
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/File.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Project.java
Log:
https://issues.jboss.org/browse/JBIDE-11597 compile failed in org.jboss.tools.cdi.ui.test when run against Juno TP
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/File.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/File.java 2012-04-20 18:06:46 UTC (rev 40389)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/File.java 2012-04-20 18:14:36 UTC (rev 40390)
@@ -646,4 +646,5 @@
}
-}
+ public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException {}
+}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Project.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Project.java 2012-04-20 18:06:46 UTC (rev 40389)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/Project.java 2012-04-20 18:14:36 UTC (rev 40390)
@@ -815,4 +815,5 @@
}
-}
+ public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException {}
+}
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r40389 - trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-04-20 14:06:46 -0400 (Fri, 20 Apr 2012)
New Revision: 40389
Modified:
trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11595 compile failed in org.jboss.tools.common.validation.test when run against Juno TP
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java 2012-04-20 18:05:14 UTC (rev 40388)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java 2012-04-20 18:06:46 UTC (rev 40389)
@@ -252,5 +252,6 @@
public void setContents(IFileState source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {}
public void setContents(InputStream source, int updateFlags, IProgressMonitor monitor) throws CoreException {}
public void setContents(IFileState source, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void accept(IResourceProxyVisitor visitor, int depth, int memberFlags) throws CoreException {}
}
}
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r40388 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-20 14:05:14 -0400 (Fri, 20 Apr 2012)
New Revision: 40388
Modified:
trunk/build/pom-soa-tooling.xml
trunk/build/pom.xml
Log:
add parent pom to build/pom.xml and build/pom-soa-tooling.xml
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2012-04-20 16:53:06 UTC (rev 40387)
+++ trunk/build/pom-soa-tooling.xml 2012-04-20 18:05:14 UTC (rev 40388)
@@ -2,6 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
+ </parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.build</artifactId>
<name>org.jboss.tools.build</name>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-04-20 16:53:06 UTC (rev 40387)
+++ trunk/build/pom.xml 2012-04-20 18:05:14 UTC (rev 40388)
@@ -2,6 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
+ <relativePath>../build/parent/pom.xml</relativePath>
+ </parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.build</artifactId>
<name>org.jboss.tools.build</name>
13 years, 8 months
JBoss Tools SVN: r40387 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-20 12:53:06 -0400 (Fri, 20 Apr 2012)
New Revision: 40387
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java
Log:
JBIDE-11514 - as6 browser popping up (cleanup)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java 2012-04-20 16:43:30 UTC (rev 40386)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java 2012-04-20 16:53:06 UTC (rev 40387)
@@ -18,26 +18,6 @@
public class JBoss6ModuleStateVerifier extends JBossLT6ModuleStateVerifier implements IServerModuleStateVerifier {
-// @Override
-// public boolean isModuleStarted(IServer server, IModule module,
-// IProgressMonitor monitor) {
-// // NO IDEA
-// return true;
-// }
-//
-// @Override
-// public void waitModuleStarted(IServer server, IModule module,
-// IProgressMonitor monitor) {
-// return;
-// }
-//
-// @Override
-// public void waitModuleStarted(IServer server, IModule module, int maxDelay) {
-// return;
-// }
-
- // If proper mbeans are found, uncomment this and customize it
-
protected boolean checkNestedWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception {
boolean val = checkStandaloneWebModuleStarted(server, module, connection);
return val;
13 years, 8 months