JBoss Tools SVN: r23245 - trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util.
by jbosstools-commits@lists.jboss.org
Author: Grid.Qian
Date: 2010-07-06 04:47:27 -0400 (Tue, 06 Jul 2010)
New Revision: 23245
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
Log:
JBIDE-6471: commit to trunk
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-07-06 06:13:46 UTC (rev 23244)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-07-06 08:47:27 UTC (rev 23245)
@@ -685,7 +685,11 @@
System.err.println("trying to replace attribute on null element:" + element.getClass());
return;
}
- if (isEqual(parseElement.getAttribute(attributeName), attributeValue)) {
+
+ // This is a problem in eclipse3.6, if we use parseElement.getAttribute(attributeName) and the attribute is not in the parseElement,
+ // users add a element firstly, it is ok. But when users add the same element secondly, we will get a NPE. It is a eclipse xml issue.
+ // So fix as below.
+ if (parseElement.getAttributes().getNamedItem(attributeName) != null && isEqual(parseElement.getAttribute(attributeName), attributeValue)) {
return;
}
15 years, 9 months
JBoss Tools SVN: r23243 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-07-06 01:45:50 -0400 (Tue, 06 Jul 2010)
New Revision: 23243
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java
Log:
JBIDE-6585 - trunk
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java 2010-07-06 03:10:18 UTC (rev 23242)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java 2010-07-06 05:45:50 UTC (rev 23243)
@@ -17,6 +17,6 @@
if( element instanceof BPELVersionDeployment ) {
return new Path(((BPELVersionDeployment)element).getPath()).lastSegment();
}
- return element == null ? "" : element.toString();//$NON-NLS-1$
+ return null;
}
}
15 years, 9 months
JBoss Tools SVN: r23242 - in trunk/hibernatetools: tests and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 23:10:18 -0400 (Mon, 05 Jul 2010)
New Revision: 23242
Modified:
trunk/hibernatetools/site/pom.xml
trunk/hibernatetools/tests/pom.xml
Log:
rename artifactids in pom.xml
Modified: trunk/hibernatetools/site/pom.xml
===================================================================
--- trunk/hibernatetools/site/pom.xml 2010-07-05 18:08:06 UTC (rev 23241)
+++ trunk/hibernatetools/site/pom.xml 2010-07-06 03:10:18 UTC (rev 23242)
@@ -7,7 +7,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.hibernatetools</groupId>
- <artifactId>site</artifactId>
+ <artifactId>hibernatetools.site</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
Modified: trunk/hibernatetools/tests/pom.xml
===================================================================
--- trunk/hibernatetools/tests/pom.xml 2010-07-05 18:08:06 UTC (rev 23241)
+++ trunk/hibernatetools/tests/pom.xml 2010-07-06 03:10:18 UTC (rev 23242)
@@ -2,7 +2,7 @@
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>
<groupId>org.jboss.tools.hibernatetools</groupId>
- <artifactId>tests</artifactId>
+ <artifactId>hibernatetools.tests</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
15 years, 9 months
JBoss Tools SVN: r23241 - trunk/drools.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 14:08:06 -0400 (Mon, 05 Jul 2010)
New Revision: 23241
Modified:
trunk/drools/pom.xml
Log:
rename pom artifactids
Modified: trunk/drools/pom.xml
===================================================================
--- trunk/drools/pom.xml 2010-07-05 18:07:23 UTC (rev 23240)
+++ trunk/drools/pom.xml 2010-07-05 18:08:06 UTC (rev 23241)
@@ -9,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
- <artifactId>drools</artifactId>
+ <artifactId>drools.all</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
15 years, 9 months
JBoss Tools SVN: r23240 - trunk/xulrunner/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 14:07:23 -0400 (Mon, 05 Jul 2010)
New Revision: 23240
Modified:
trunk/xulrunner/site/pom.xml
Log:
rename pom artifactids
Modified: trunk/xulrunner/site/pom.xml
===================================================================
--- trunk/xulrunner/site/pom.xml 2010-07-05 18:07:15 UTC (rev 23239)
+++ trunk/xulrunner/site/pom.xml 2010-07-05 18:07:23 UTC (rev 23240)
@@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner</groupId>
- <artifactId>site</artifactId>
+ <artifactId>xulrunner.site</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
15 years, 9 months
JBoss Tools SVN: r23239 - trunk/jst/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 14:07:15 -0400 (Mon, 05 Jul 2010)
New Revision: 23239
Modified:
trunk/jst/site/pom.xml
Log:
rename pom artifactids
Modified: trunk/jst/site/pom.xml
===================================================================
--- trunk/jst/site/pom.xml 2010-07-05 18:06:58 UTC (rev 23238)
+++ trunk/jst/site/pom.xml 2010-07-05 18:07:15 UTC (rev 23239)
@@ -7,7 +7,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jst</groupId>
- <artifactId>site</artifactId>
+ <artifactId>jst.site</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
15 years, 9 months
JBoss Tools SVN: r23238 - trunk/seam.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 14:06:58 -0400 (Mon, 05 Jul 2010)
New Revision: 23238
Modified:
trunk/seam/pom.xml
Log:
rename pom artifactids
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2010-07-05 18:00:25 UTC (rev 23237)
+++ trunk/seam/pom.xml 2010-07-05 18:06:58 UTC (rev 23238)
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>seam</artifactId>
+ <artifactId>seam.all</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
15 years, 9 months
JBoss Tools SVN: r23237 - in trunk: site and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 14:00:25 -0400 (Mon, 05 Jul 2010)
New Revision: 23237
Modified:
trunk/pom.xml
trunk/site/pom.xml
Log:
rename pom artifactids
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-07-05 16:56:55 UTC (rev 23236)
+++ trunk/pom.xml 2010-07-05 18:00:25 UTC (rev 23237)
@@ -2,7 +2,7 @@
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>
<groupId>org.jboss</groupId>
-<artifactId>tools</artifactId>
+<artifactId>jbosstools</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
Modified: trunk/site/pom.xml
===================================================================
--- trunk/site/pom.xml 2010-07-05 16:56:55 UTC (rev 23236)
+++ trunk/site/pom.xml 2010-07-05 18:00:25 UTC (rev 23237)
@@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
- <artifactId>site</artifactId>
+ <artifactId>jbosstools.site</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
15 years, 9 months
JBoss Tools SVN: r23236 - in trunk/maven: site and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 12:56:55 -0400 (Mon, 05 Jul 2010)
New Revision: 23236
Modified:
trunk/maven/features/pom.xml
trunk/maven/site/site.xml
Log:
add jsf feature to features to build and into update site
Modified: trunk/maven/features/pom.xml
===================================================================
--- trunk/maven/features/pom.xml 2010-07-05 16:50:59 UTC (rev 23235)
+++ trunk/maven/features/pom.xml 2010-07-05 16:56:55 UTC (rev 23236)
@@ -8,6 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.maven.feature</module>
+ <module>org.jboss.tools.maven.jsf.feature</module>
<module>org.jboss.tools.maven.seam.feature</module>
</modules>
</project>
Modified: trunk/maven/site/site.xml
===================================================================
--- trunk/maven/site/site.xml 2010-07-05 16:50:59 UTC (rev 23235)
+++ trunk/maven/site/site.xml 2010-07-05 16:56:55 UTC (rev 23236)
@@ -11,5 +11,8 @@
<feature url="features/org.jboss.tools.maven.seam.feature_0.0.0.jar" id="org.jboss.tools.maven.seam.feature" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar" id="org.jboss.tools.maven.jsf.feature" version="0.0.0">
+ <category name="JBoss Tools maven Nightly Build Update Site"/>
+ </feature>
</site>
15 years, 9 months
JBoss Tools SVN: r23235 - trunk/maven/plugins.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-05 12:50:59 -0400 (Mon, 05 Jul 2010)
New Revision: 23235
Modified:
trunk/maven/plugins/pom.xml
Log:
add org.jboss.tools.maven.jsf to pom
Modified: trunk/maven/plugins/pom.xml
===================================================================
--- trunk/maven/plugins/pom.xml 2010-07-05 07:29:19 UTC (rev 23234)
+++ trunk/maven/plugins/pom.xml 2010-07-05 16:50:59 UTC (rev 23235)
@@ -8,6 +8,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.maven.core</module>
+ <module>org.jboss.tools.maven.jsf</module>
<module>org.jboss.tools.maven.seam</module>
<module>org.jboss.tools.maven.ui</module>
</modules>
15 years, 9 months