JBoss Tools SVN: r33364 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-29 16:06:57 -0400 (Fri, 29 Jul 2011)
New Revision: 33364
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java
Log:
FileSystemsHelper.getFile(object) method used.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java 2011-07-29 19:36:55 UTC (rev 33363)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java 2011-07-29 20:06:57 UTC (rev 33364)
@@ -12,6 +12,7 @@
import org.jboss.tools.cdi.seam.core.international.ILocalizedValue;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
/**
*
@@ -42,8 +43,7 @@
}
public static String getLocale(XModelObject object) {
- XModelObject p = object;
- while(p != null && p.getFileType() < XModelObject.FILE) p = p.getParent();
+ XModelObject p = FileSystemsHelper.getFile(object);
if(p != null) {
String n = p.getAttributeValue("name");
int i = n.indexOf('_');
13 years, 5 months
JBoss Tools SVN: r33363 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-07-29 15:36:55 -0400 (Fri, 29 Jul 2011)
New Revision: 33363
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
Log:
JBIDE-9422
org.jboss.tools.seam.ui.test JUnit Test failure
JSF natures/JSF checks are disabled on test project
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-29 19:21:14 UTC (rev 33362)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-29 19:36:55 UTC (rev 33363)
@@ -35,36 +35,59 @@
public static Test suite() {
return new TestSuite(ELExprPartitionerTest.class);
}
- private String isKbNatureCheckNeed = null;
+
public static final QualifiedName IS_KB_NATURES_CHECK_NEED = new QualifiedName(
"", "Is KB natures check"); //$NON-NLS-1$
+ public static final QualifiedName IS_JSF_NATURES_CHECK_NEED = new QualifiedName(
+ "", "Is JSF natures check"); //$NON-NLS-1$
+ public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName(
+ "", "Is JSF check"); //$NON-NLS-1$
+ private String isKbNatureCheck = null;
+ private String isJsfNatureCheck = null;
+ private String isJsfCheck = null;
public void setUp() throws Exception {
-// System.out.println(">>>> ELExprPartitionerTest >>>>");
+ System.out.println(">>>> ELExprPartitionerTest >>>>");
provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", "projects/" + PROJECT_NAME, PROJECT_NAME, makeCopy);
project = provider.getProject();
Throwable exception = null;
assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
if (project != null) {
- isKbNatureCheckNeed = project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED);
-// System.out.println("Is KB natures check: '" + isKbNatureCheckNeed + "'");
+ isKbNatureCheck = project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED);
+ System.out.println("Before: Is KB natures check: '" + isKbNatureCheck + "'");
project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$
Boolean.toString(false));
-// System.out.println("Is KB natures check: '" + project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) + "'");
+ isJsfNatureCheck = project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED);
+ System.out.println("Before: Is JSF natures check: '" + isJsfNatureCheck + "'");
+ project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$
+ Boolean.toString(false));
+ isJsfCheck = project.getPersistentProperty(IS_JSF_CHECK_NEED);
+ System.out.println("Before: Is JSF check: '" + isJsfCheck + "'");
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$
+ Boolean.toString(false));
+ System.out.println("While Testing: Is KB natures check: '" + project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) + "'");
+ System.out.println("While Testing: Is JSF natures check: '" + project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED) + "'");
+ System.out.println("While Testing: Is JSF check: '" + project.getPersistentProperty(IS_JSF_CHECK_NEED) + "'");
}
}
protected void tearDown() throws Exception {
if (project != null) {
project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$
- isKbNatureCheckNeed);
-// System.out.println("Is KB natures check: '" + project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) + "'");
+ isKbNatureCheck);
+ System.out.println("Restored default: Is KB natures check: '" + project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) + "'");
+ project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$
+ isJsfNatureCheck);
+ System.out.println("Restored default: Is JSF natures check: '" + project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED) + "'");
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$
+ isJsfCheck);
+ System.out.println("Restored default: Is JSF check: '" + project.getPersistentProperty(IS_JSF_CHECK_NEED) + "'");
}
if(provider != null) {
provider.dispose();
}
-// System.out.println("<<<< ELExprPartitionerTest <<<<");
+ System.out.println("<<<< ELExprPartitionerTest <<<<");
}
public void testELExprPartitioner() throws Exception{
13 years, 5 months
JBoss Tools SVN: r33362 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-29 15:21:14 -0400 (Fri, 29 Jul 2011)
New Revision: 33362
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
Log:
JBIDE-9408
https://issues.jboss.org/browse/JBIDE-9408
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java 2011-07-29 19:20:21 UTC (rev 33361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java 2011-07-29 19:21:14 UTC (rev 33362)
@@ -45,4 +45,11 @@
return object == null ? null : getLibs(object.getModel());
}
+ public static XModelObject getFile(XModelObject o) {
+ while(o != null && o.getFileType() != XModelObject.FILE) {
+ o = o.getParent();
+ }
+ return o;
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2011-07-29 19:20:21 UTC (rev 33361)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2011-07-29 19:21:14 UTC (rev 33362)
@@ -45,6 +45,7 @@
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.event.XModelTreeListener;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.filesystems.impl.AbstractExtendedXMLFileImpl;
import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl;
import org.jboss.tools.common.model.filesystems.impl.FileSystemPeer;
import org.jboss.tools.common.model.loaders.EntityRecognizer;
@@ -360,7 +361,11 @@
if(edit) {
((XModelObjectImpl)object).onAttributeValueEdit(attributeName, ov, nv);
}
-//// ent.getAttribute(attributeName).valueChanged(object);
+ XModelObject f = FileSystemsHelper.getFile(object);
+ if(f instanceof AbstractExtendedXMLFileImpl) {
+ ((AbstractExtendedXMLFileImpl)f).check();
+ }
+// ent.getAttribute(attributeName).valueChanged(object);
}
private boolean isDifferent(String v1, String v2) {
13 years, 5 months
JBoss Tools SVN: r33361 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-29 15:20:21 -0400 (Fri, 29 Jul 2011)
New Revision: 33361
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java
Log:
JBIDE-9408
https://issues.jboss.org/browse/JBIDE-9408
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2011-07-29 19:19:39 UTC (rev 33360)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractExtendedXMLFileImpl.java 2011-07-29 19:20:21 UTC (rev 33361)
@@ -264,7 +264,9 @@
}
set("actualBodyTimeStamp", "" + getTimeStamp()); //$NON-NLS-1$ //$NON-NLS-2$
if(errors1) m.fireStructureChanged(this);
- if(!isOverlapped) constraintChecker.check();
+ if(!isOverlapped) {
+ check();
+ }
} else {
//old edit by replace
p.removeChild_0(this);
@@ -274,6 +276,10 @@
if(!isOverlapped) f.getResourceMarkers().update();
}
}
+
+ public void check() {
+ constraintChecker.check();
+ }
protected void safeChangeTimeStamp() {
boolean b = ("" + getTimeStamp()).equals(get("actualBodyTimeStamp")); //$NON-NLS-1$ //$NON-NLS-2$
13 years, 5 months
JBoss Tools SVN: r33360 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-29 15:19:39 -0400 (Fri, 29 Jul 2011)
New Revision: 33360
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java
Log:
JBIDE-9408
https://issues.jboss.org/browse/JBIDE-9408
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java 2011-07-29 18:31:38 UTC (rev 33359)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintChecker.java 2011-07-29 19:19:39 UTC (rev 33360)
@@ -32,9 +32,12 @@
public void check() {
if(object == null || !object.isActive()) return;
+ boolean empty = p.problems.isEmpty();
p.problems.clear();
check(object);
- addMarkers();
+ if(!empty || !p.problems.isEmpty()) {
+ addMarkers();
+ }
}
private void check(XModelObject o) {
13 years, 5 months
JBoss Tools SVN: r33359 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-29 14:31:38 -0400 (Fri, 29 Jul 2011)
New Revision: 33359
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java
Log:
JBIDE-9408
https://issues.jboss.org/browse/JBIDE-9408
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2011-07-29 18:19:33 UTC (rev 33358)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2011-07-29 18:31:38 UTC (rev 33359)
@@ -223,10 +223,9 @@
}
protected void safeChangeTimeStamp() {
- changeTimeStamp();
- }
-
-
+ ++timeStamp;
+ if(parent != null) parent.safeChangeTimeStamp();
+ }
// children
13 years, 5 months
JBoss Tools SVN: r33358 - trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-29 14:19:33 -0400 (Fri, 29 Jul 2011)
New Revision: 33358
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9419
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java 2011-07-29 18:09:34 UTC (rev 33357)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java 2011-07-29 18:19:33 UTC (rev 33358)
@@ -16,7 +16,7 @@
public void testXMLInjectedPointHyperlinkDetector() throws Exception {
ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
- regionList.add(new TestRegion(2166, 15/*"s:Inject"*/, new TestHyperlink[]{
+ regionList.add(new TestRegion(/*2166, 15*/"<test04:myType6", new TestHyperlink[]{
new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MyBean6.myType6")
//new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES)
}));
13 years, 5 months
JBoss Tools SVN: r33357 - in trunk/xulrunner: features and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-07-29 14:09:34 -0400 (Fri, 29 Jul 2011)
New Revision: 33357
Modified:
trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
trunk/xulrunner/features/pom.xml
trunk/xulrunner/plugins/org.mozilla.xpcom/pom.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml
trunk/xulrunner/plugins/pom.xml
trunk/xulrunner/pom.xml
trunk/xulrunner/site/pom.xml
Log:
JBIDE-9268
- Changed version from 0.0.1-SNAPSHOT to 1.9.2-SNAPSHOT version in all XULRunner poms
- Added comments for plugin poms
Modified: trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.features</groupId>
<artifactId>org.mozilla.xpcom.feature</artifactId>
Modified: trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.features</groupId>
<artifactId>org.mozilla.xulrunner.feature</artifactId>
Modified: trunk/xulrunner/features/pom.xml
===================================================================
--- trunk/xulrunner/features/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/features/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>xulrunner</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>features</artifactId>
<name>xulrunner.features</name>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.mozilla.xpcom.feature</module>
Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xpcom/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/plugins/org.mozilla.xpcom/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
<artifactId>org.mozilla.xpcom</artifactId>
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
<artifactId>org.mozilla.xulrunner.cocoa.macosx</artifactId>
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,10 +4,11 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
- <artifactId>org.mozilla.xulrunner.gtk.linux.x86</artifactId>
+ <artifactId>org.mozilla.xulrunner.gtk.linux.x86</artifactId>
+ <!-- 'b' at the end of the version means this is changed original binaries (nullplugin removed, see JBIDE-8792) -->
<version>1.9.2.16b</version>
<packaging>eclipse-plugin</packaging>
<build>
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,10 +4,13 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
- <artifactId>org.mozilla.xulrunner.gtk.linux.x86_64</artifactId>
+ <artifactId>org.mozilla.xulrunner.gtk.linux.x86_64</artifactId>
+ <!-- 1.9.2.19pre version is downloaded from XULRunner nightly builds
+ http://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly/latest-trunk/ .
+ This build works on RHEL5 x86_64 unlike ones we compiled under Ununtu x86_64 (see JBIDE-9146)-->
<version>1.9.2.19pre</version>
<packaging>eclipse-plugin</packaging>
<build>
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,10 +4,11 @@
<parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
- <artifactId>org.mozilla.xulrunner.win32.win32.x86</artifactId>
+ <artifactId>org.mozilla.xulrunner.win32.win32.x86</artifactId>
+ <!-- 'b' at the end of the version means this is changed original binaries (nullplugin removed, see JBIDE-8792) -->
<version>1.9.2.16b</version>
<packaging>eclipse-plugin</packaging>
<build>
Modified: trunk/xulrunner/plugins/pom.xml
===================================================================
--- trunk/xulrunner/plugins/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/plugins/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>xulrunner</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>plugins</artifactId>
<name>xulrunner.plugins</name>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.mozilla.xpcom</module>
Modified: trunk/xulrunner/pom.xml
===================================================================
--- trunk/xulrunner/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -10,7 +10,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>xulrunner</artifactId>
<name>xulrunner.all</name>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>features</module>
Modified: trunk/xulrunner/site/pom.xml
===================================================================
--- trunk/xulrunner/site/pom.xml 2011-07-29 16:56:21 UTC (rev 33356)
+++ trunk/xulrunner/site/pom.xml 2011-07-29 18:09:34 UTC (rev 33357)
@@ -4,11 +4,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>xulrunner</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner</groupId>
<artifactId>xulrunner.site</artifactId>
<name>xulrunner.site</name>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.9.2-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
13 years, 5 months
JBoss Tools SVN: r33356 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-07-29 12:56:21 -0400 (Fri, 29 Jul 2011)
New Revision: 33356
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
Log:
JBIDE-9422
org.jboss.tools.seam.ui.test JUnit Test failure
KB natures check is disabled on test project (caused seam-ui tests to hang up)
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-29 16:00:35 UTC (rev 33355)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-29 16:56:21 UTC (rev 33356)
@@ -35,34 +35,36 @@
public static Test suite() {
return new TestSuite(ELExprPartitionerTest.class);
}
- private boolean isKbNatureCheckNeed = false;
+ private String isKbNatureCheckNeed = null;
public static final QualifiedName IS_KB_NATURES_CHECK_NEED = new QualifiedName(
"", "Is KB natures check"); //$NON-NLS-1$
public void setUp() throws Exception {
- System.out.println(">>>> ELExprPartitionerTest >>>>");
+// System.out.println(">>>> ELExprPartitionerTest >>>>");
provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", "projects/" + PROJECT_NAME, PROJECT_NAME, makeCopy);
project = provider.getProject();
Throwable exception = null;
assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
- isKbNatureCheckNeed = Boolean.valueOf(project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED));
- System.out.println("Is KB natures check: " + isKbNatureCheckNeed);
- project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$
- Boolean.toString(false));
- System.out.println("Is KB natures check: " + Boolean.valueOf(project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED)));
+ if (project != null) {
+ isKbNatureCheckNeed = project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED);
+// System.out.println("Is KB natures check: '" + isKbNatureCheckNeed + "'");
+ project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$
+ Boolean.toString(false));
+// System.out.println("Is KB natures check: '" + project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) + "'");
+ }
}
protected void tearDown() throws Exception {
if (project != null) {
project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$
- Boolean.toString(isKbNatureCheckNeed));
- System.out.println("Is KB natures check: " + Boolean.valueOf(project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED)));
+ isKbNatureCheckNeed);
+// System.out.println("Is KB natures check: '" + project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED) + "'");
}
if(provider != null) {
provider.dispose();
}
- System.out.println("<<<< ELExprPartitionerTest <<<<");
+// System.out.println("<<<< ELExprPartitionerTest <<<<");
}
public void testELExprPartitioner() throws Exception{
13 years, 5 months
JBoss Tools SVN: r33355 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/jbt/builtin and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-29 12:00:35 -0400 (Fri, 29 Jul 2011)
New Revision: 33355
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.changed
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.original
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
JBIDE-9401
https://issues.jboss.org/browse/JBIDE-9401
Test for built-in bean injection in cases of presence/absence of its custom implementation.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.changed
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.changed (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.changed 2011-07-29 16:00:35 UTC (rev 33355)
@@ -0,0 +1,51 @@
+package org.jboss.jsr299.tck.tests.jbt.builtin;
+
+import javax.enterprise.context.Conversation;
+import javax.inject.Named;
+
+@Named("javax.enterprise.context.conversation")
+public class ConversationImpl implements Conversation {
+
+ @Override
+ public void begin() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void begin(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void end() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public String getId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public long getTimeout() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public boolean isTransient() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setTimeout(long arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.java 2011-07-29 16:00:35 UTC (rev 33355)
@@ -0,0 +1,53 @@
+package org.jboss.jsr299.tck.tests.jbt.builtin;
+
+import javax.enterprise.context.Conversation;
+import javax.inject.Named;
+
+@Named("javax.enterprise.context.conversation")
+public class ConversationImpl implements Conversation {
+
+ public ConversationImpl(String s) {}
+
+ @Override
+ public void begin() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void begin(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void end() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public String getId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public long getTimeout() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public boolean isTransient() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setTimeout(long arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.original (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/builtin/ConversationImpl.original 2011-07-29 16:00:35 UTC (rev 33355)
@@ -0,0 +1,53 @@
+package org.jboss.jsr299.tck.tests.jbt.builtin;
+
+import javax.enterprise.context.Conversation;
+import javax.inject.Named;
+
+@Named("javax.enterprise.context.conversation")
+public class ConversationImpl implements Conversation {
+
+ public ConversationImpl(String s) {}
+
+ @Override
+ public void begin() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void begin(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void end() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public String getId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public long getTimeout() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public boolean isTransient() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setTimeout(long arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-07-29 15:06:38 UTC (rev 33354)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-07-29 16:00:35 UTC (rev 33355)
@@ -19,6 +19,8 @@
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.Libs;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -98,6 +100,7 @@
IFile target = project.getFile(new Path(targetPath));
IFile source = project.getFile(new Path(sourcePath));
assertTrue(source.exists());
+ ValidatorManager.setStatus(ValidatorManager.RUNNING);
if(!target.exists()) {
target.create(source.getContents(), true, new NullProgressMonitor());
} else {
@@ -106,6 +109,7 @@
JobUtils.waitForIdle();
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
JobUtils.waitForIdle();
+ TestUtil.waitForValidation();
} finally {
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
JobUtils.waitForIdle();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-07-29 15:06:38 UTC (rev 33354)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-07-29 16:00:35 UTC (rev 33355)
@@ -12,12 +12,15 @@
import java.util.Set;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IBuiltInBean;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.test.RemoveJarFromClasspathTest;
/**
* @author Viacheslav Kabanovich
@@ -116,6 +119,7 @@
IBean b = beans.iterator().next();
assertTrue(b instanceof IClassBean);
+ assertTrue(b instanceof IBuiltInBean);
IType t = b.getBeanClass();
assertEquals(CDIConstants.CONVERSATION_TYPE_NAME, t.getFullyQualifiedName());
assertEquals(CDIConstants.CONVERSATION_BEAN_NAME, b.getName());
@@ -123,4 +127,36 @@
assertTrue(beans.contains(b));
}
+ /**
+ * Test that when custom project provides implementation of javax.enterprise.context.Conversation
+ * that is visible to our model, our built-in bean is replaced by it.
+ */
+ public void testBuiltInConversationBeanCustomImplementation() throws CoreException {
+ String c = "JavaSource/org/jboss/jsr299/tck/tests/jbt/builtin/ConversationImpl.java";
+ String c_active = "JavaSource/org/jboss/jsr299/tck/tests/jbt/builtin/ConversationImpl.changed";
+ String c_original = "JavaSource/org/jboss/jsr299/tck/tests/jbt/builtin/ConversationImpl.original";
+
+ Set<IBean> beans = cdiProject.getBeans(CDIConstants.CONVERSATION_BEAN_NAME, false);
+ assertEquals(1, beans.size());
+ IBean b = beans.iterator().next();
+ assertTrue(b instanceof IClassBean);
+ assertTrue(b instanceof IBuiltInBean);
+
+ RemoveJarFromClasspathTest.replaceFile(tckProject, c_active, c);
+
+ beans = cdiProject.getBeans(CDIConstants.CONVERSATION_BEAN_NAME, false);
+ assertEquals(1, beans.size());
+ b = beans.iterator().next();
+ assertTrue(b instanceof IClassBean);
+ assertFalse(b instanceof IBuiltInBean);
+ assertEquals("org.jboss.jsr299.tck.tests.jbt.builtin.ConversationImpl", b.getBeanClass().getFullyQualifiedName());
+
+ RemoveJarFromClasspathTest.replaceFile(tckProject, c_original, c);
+ beans = cdiProject.getBeans(CDIConstants.CONVERSATION_BEAN_NAME, false);
+ b = beans.iterator().next();
+ assertEquals(1, beans.size());
+ assertTrue(b instanceof IClassBean);
+ assertTrue(b instanceof IBuiltInBean);
+ }
+
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-07-29 15:06:38 UTC (rev 33354)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-07-29 16:00:35 UTC (rev 33355)
@@ -207,7 +207,14 @@
static class JavaFileFilter implements FileFilter {
public boolean accept(File pathname) {
String name = pathname.getName();
- return (pathname.isDirectory() && !name.endsWith(".svn")) || ((name.endsWith(".java") || name.endsWith(".qfxresult") || name.endsWith(".validation") || name.equals("beans.xml")) && !name.endsWith("Test.java"));
+ return (pathname.isDirectory() && !name.endsWith(".svn"))
+ || ((name.endsWith(".java")
+ || name.endsWith(".qfxresult")
+ || name.endsWith(".validation")
+ || name.endsWith(".changed") //used to replace content of java file
+ || name.endsWith(".original") //used to restore content of java file
+ || name.equals("beans.xml"))
+ && !name.endsWith("Test.java"));
}
}
13 years, 5 months