JBoss Tools SVN: r40882 - trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-05-09 15:10:10 -0400 (Wed, 09 May 2012)
New Revision: 40882
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java
Log:
JBIDE-11816 NPE Occurs After Changing Node Type Definition Name. Had to set a default proposal provider (one without proposals). This default proposal provider gets overridden when proposals are needed.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java 2012-05-09 17:35:56 UTC (rev 40881)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java 2012-05-09 19:10:10 UTC (rev 40882)
@@ -14,6 +14,7 @@
import org.eclipse.jface.bindings.keys.KeyStroke;
import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
import org.eclipse.jface.fieldassist.TextContentAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
@@ -163,7 +164,7 @@
this.proposalAdapter = new ContentProposalAdapter(this.txtName,
new TextContentAdapter(),
- null,
+ new SimpleContentProposalProvider(new String[0]),
KeyStroke.getInstance(SWT.CTRL, ' '),
CndValidator.LOCAL_NAME_VALID_CHARS.toCharArray());
this.proposalAdapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
12 years, 8 months
JBoss Tools SVN: r40881 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-09 13:35:56 -0400 (Wed, 09 May 2012)
New Revision: 40881
Modified:
trunk/build/target-platform/multiple-junoM6.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
Log:
use http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/ instead of http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/
Modified: trunk/build/target-platform/multiple-junoM6.target
===================================================================
--- trunk/build/target-platform/multiple-junoM6.target 2012-05-09 17:28:53 UTC (rev 40880)
+++ trunk/build/target-platform/multiple-junoM6.target 2012-05-09 17:35:56 UTC (rev 40881)
@@ -7,9 +7,9 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
<locations>
- <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use _composite_/core/3.3.indigo -->
+ <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
<!-- <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/"/>
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
</location> -->
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-05-09 17:28:53 UTC (rev 40880)
+++ trunk/build/target-platform/multiple.target 2012-05-09 17:35:56 UTC (rev 40881)
@@ -8,8 +8,8 @@
-->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <!-- for trunk use _composite_/core/trunk; for 3.3_stable_branch, use _composite_/core/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/"/>
+ <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-05-09 17:28:53 UTC (rev 40880)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-05-09 17:35:56 UTC (rev 40881)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/"/>
+<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
12 years, 8 months
JBoss Tools SVN: r40880 - trunk/common/features/org.jboss.tools.common.mylyn.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-09 13:28:53 -0400 (Wed, 09 May 2012)
New Revision: 40880
Modified:
trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
Log:
fix versions of dependent upstream stuff; add optional stuff like wikitext, cvs, and subclipse support because then it's consistent w/ the JBDS experience too (JBDS-2098)
Modified: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-09 17:28:44 UTC (rev 40879)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-09 17:28:53 UTC (rev 40880)
@@ -5,6 +5,7 @@
<copyright>%copyright</copyright>
<license>%license</license>
+ <!-- JBDS-2098 add defaults for issues.jboss.org and bugzilla.redhat.com -->
<plugin id="org.jboss.tools.common.mylyn" download-size="0" install-size="0" version="0.0.0" />
<requires>
@@ -16,11 +17,10 @@
<import feature="org.eclipse.mylyn.java_feature" version="3.6.5" match="greaterOrEqual" />
<import feature="org.eclipse.mylyn.pde_feature" version="3.6.5" match="greaterOrEqual" />
<import feature="org.eclipse.mylyn.team_feature" version="3.6.5" match="greaterOrEqual" />
-
+ <import feature="org.eclipse.mylyn.cvs" version="0.8.2" match="greaterOrEqual" />
<import feature="org.eclipse.mylyn.versions" version="0.8.5" match="greaterOrEqual" />
+ <import feature="org.eclipse.mylyn.wikitext_feature" version="1.5.2" match="greaterOrEqual" />
- <!-- JBDS-2098 add required mylyn and atlassian plugins/features; not sure if we need subclipse, bamboo, crucible, or fisheye support -->
- <!--
<plugin id="com.atlassian.connector.eclipse.bamboo.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
<plugin id="com.atlassian.connector.eclipse.bamboo.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
<plugin id="com.atlassian.connector.eclipse.crucible.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
@@ -29,7 +29,6 @@
<plugin id="com.atlassian.connector.eclipse.fisheye.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
<plugin id="com.atlassian.connector.eclipse.subclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
<plugin id="com.atlassian.connector.eclipse.subclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- -->
<plugin id="org.eclipse.mylyn.tasks.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
<plugin id="org.eclipse.mylyn.tasks.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
@@ -76,8 +75,8 @@
<plugin id="org.apache.commons.codec" version="1.3.0" match="greaterOrEqual" unpack="false" />
<plugin id="org.jdom_jaxen" version="1.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.mortbay.jetty.server" version="6.1.23" match="greaterOrEqual" unpack="false" />
- <plugin id="org.mortbay.jetty.util" version="6.1.23" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.mortbay.jetty.server" version="6.1.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.mortbay.jetty.util" version="6.1.0" match="greaterOrEqual" unpack="false" />
<plugin id="org.apache.jasper" version="5.5.17" match="greaterOrEqual" unpack="false" />
<plugin id="org.joda.time" version="1.6.0" match="greaterOrEqual" unpack="false" />
12 years, 8 months
JBoss Tools SVN: r40878 - trunk/common/features/org.jboss.tools.common.mylyn.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-09 13:10:54 -0400 (Wed, 09 May 2012)
New Revision: 40878
Modified:
trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
Log:
remove excludes from source feature gen (JBDS-2098)
Modified: trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml 2012-05-09 17:10:47 UTC (rev 40877)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml 2012-05-09 17:10:54 UTC (rev 40878)
@@ -28,40 +28,8 @@
</executions>
<configuration>
<excludes>
- <plugin id="com.thoughtworks.xstream"/>
- <plugin id="org.apache.axis"/>
- <plugin id="org.apache.commons.logging"/>
- <plugin id="org.apache.commons.io"/>
- <plugin id="org.apache.commons.httpclient"/>
- <plugin id="org.apache.commons.lang"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.jdom_jaxen"/>
- <plugin id="org.mortbay.jetty.server"/>
- <plugin id="org.mortbay.jetty.util"/>
- <plugin id="org.apache.jasper"/>
- <plugin id="org.joda.time"/>
- <plugin id="javax.servlet"/>
- <plugin id="javax.servlet.jsp"/>
- <plugin id="javax.xml.rpc"/>
- <plugin id="javax.el"/>
- <plugin id="org.eclipse.mylyn.tasks.ui"/>
- <plugin id="org.eclipse.mylyn.tasks.core"/>
- <plugin id="org.eclipse.mylyn.tasks.bugs"/>
- <plugin id="com.atlassian.connector.commons"/>
- <plugin id="com.atlassian.connector.eclipse.branding.ui"/>
- <plugin id="com.atlassian.connector.eclipse.commons.core"/>
- <plugin id="com.atlassian.connector.eclipse.commons.ui"/>
- <plugin id="com.atlassian.connector.eclipse.core"/>
- <plugin id="com.atlassian.connector.eclipse.cvs.core"/>
- <plugin id="com.atlassian.connector.eclipse.cvs.ui"/>
- <plugin id="com.atlassian.connector.eclipse.directclickthrough.ui"/>
- <plugin id="com.atlassian.connector.eclipse.help"/>
- <plugin id="com.atlassian.connector.eclipse.jira.core"/>
- <plugin id="com.atlassian.connector.eclipse.jira.ui"/>
- <plugin id="com.atlassian.connector.eclipse.monitor.core"/>
- <plugin id="com.atlassian.connector.eclipse.monitor.ui"/>
- <plugin id="com.atlassian.connector.eclipse.ui"/>
- <!-- <feature id="sourcefeature.feature.nosource"/> -->
+ <!-- <plugin id="sourceplugin.nosource"/> -->
+ <!-- <feature id="sourcefeature.feature.nosource"/> -->
</excludes>
</configuration>
</plugin>
12 years, 8 months
JBoss Tools SVN: r40877 - trunk/common/features/org.jboss.tools.common.mylyn.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-09 13:10:47 -0400 (Wed, 09 May 2012)
New Revision: 40877
Modified:
trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
Log:
JBDS-2098 set 3rd party deps as REQUIRED, not INCLUDED; fix version of javax.servlet(.jsp) to lower minimum
Modified: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-09 17:03:22 UTC (rev 40876)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2012-05-09 17:10:47 UTC (rev 40877)
@@ -18,72 +18,72 @@
<import feature="org.eclipse.mylyn.team_feature" version="3.6.5" match="greaterOrEqual" />
<import feature="org.eclipse.mylyn.versions" version="0.8.5" match="greaterOrEqual" />
- </requires>
- <!-- JBDS-2098 add required mylyn and atlassian plugins/features; not sure if we need subclipse, bamboo, crucible, or fisheye support -->
- <!--
- <plugin id="com.atlassian.connector.eclipse.bamboo.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.bamboo.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.crucible.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.crucible.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.fisheye.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.fisheye.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.subclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.subclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- -->
+ <!-- JBDS-2098 add required mylyn and atlassian plugins/features; not sure if we need subclipse, bamboo, crucible, or fisheye support -->
+ <!--
+ <plugin id="com.atlassian.connector.eclipse.bamboo.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.bamboo.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.crucible.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.crucible.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.fisheye.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.fisheye.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.subclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.subclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ -->
- <plugin id="org.eclipse.mylyn.tasks.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.mylyn.tasks.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.mylyn.tasks.bugs" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.mylyn.tasks.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.mylyn.tasks.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.mylyn.tasks.bugs" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.commons" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.branding.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.commons.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.commons.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.cvs.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.cvs.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.directclickthrough.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.help" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.jira.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.jira.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.monitor.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.monitor.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="com.atlassian.connector.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.commons" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.branding.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.commons.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.commons.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.cvs.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.cvs.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.directclickthrough.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.help" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.jira.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.jira.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.monitor.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.monitor.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="com.atlassian.connector.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <!-- JBDS-1682 dependent 3rd party plugins needed to install Atlassian JIRA support -->
- <plugin id="com.thoughtworks.xstream" version="1.3.0" match="greaterOrEqual" unpack="false" />
+ <!-- JBDS-1682 dependent 3rd party plugins needed to install Atlassian JIRA support -->
+ <plugin id="com.thoughtworks.xstream" version="1.3.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.osgi" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.core.filesystem" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.team.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.team.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.jface" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.eclipse.compare" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.osgi" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.core.filesystem" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.team.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.team.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.jface" version="0.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.eclipse.compare" version="0.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.apache.axis" version="1.4.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.apache.commons.logging" version="1.1.1" match="greaterOrEqual" unpack="false" />
- <plugin id="org.apache.commons.io" version="2.0.1" match="greaterOrEqual" unpack="false" />
- <plugin id="org.apache.commons.httpclient" version="3.1.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.apache.commons.lang" version="2.4.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.apache.commons.codec" version="1.3.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.apache.axis" version="1.4.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.apache.commons.logging" version="1.1.1" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.apache.commons.io" version="2.0.1" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.apache.commons.httpclient" version="3.1.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.apache.commons.lang" version="2.4.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.apache.commons.codec" version="1.3.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.jdom_jaxen" version="1.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="org.mortbay.jetty.server" version="6.1.23" match="greaterOrEqual" unpack="false" />
- <plugin id="org.mortbay.jetty.util" version="6.1.23" match="greaterOrEqual" unpack="false" />
- <plugin id="org.apache.jasper" version="5.5.17" match="greaterOrEqual" unpack="false" />
- <plugin id="org.joda.time" version="1.6.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.jdom_jaxen" version="1.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.mortbay.jetty.server" version="6.1.23" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.mortbay.jetty.util" version="6.1.23" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.apache.jasper" version="5.5.17" match="greaterOrEqual" unpack="false" />
+ <plugin id="org.joda.time" version="1.6.0" match="greaterOrEqual" unpack="false" />
- <plugin id="javax.servlet" version="3.0.0" match="greaterOrEqual" unpack="false" />
- <plugin id="javax.servlet.jsp" version="2.2.0" match="greaterOrEqual" unpack="false" />
- <plugin id="javax.xml.rpc" version="1.1.0" match="greaterOrEqual" unpack="false" />
- <plugin id="javax.el" version="2.2.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="javax.servlet" version="2.5.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="javax.servlet.jsp" version="2.0.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="javax.xml.rpc" version="1.1.0" match="greaterOrEqual" unpack="false" />
+ <plugin id="javax.el" version="2.2.0" match="greaterOrEqual" unpack="false" />
+ </requires>
</feature>
12 years, 8 months
JBoss Tools SVN: r40876 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-09 13:03:22 -0400 (Wed, 09 May 2012)
New Revision: 40876
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
use org.eclipse.m2e.feature.feature.group 1.0.200.20111228-1245 instead of 1.0.100
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-05-09 16:56:27 UTC (rev 40875)
+++ trunk/build/target-platform/jbds.target 2012-05-09 17:03:22 UTC (rev 40876)
@@ -17,7 +17,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201205021739"/>
@@ -275,4 +275,4 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e37.feature.feature.group" version="2.4.0.v201201120043-rel-r37"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-05-09 16:56:27 UTC (rev 40875)
+++ trunk/build/target-platform/multiple.target 2012-05-09 17:03:22 UTC (rev 40876)
@@ -19,7 +19,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201205021739"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-05-09 16:56:27 UTC (rev 40875)
+++ trunk/build/target-platform/unified.target 2012-05-09 17:03:22 UTC (rev 40876)
@@ -19,7 +19,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="org.jboss.tools.maven.apt.feature.feature.group" version="1.0.0.201205021739"/>
@@ -337,4 +337,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>
12 years, 8 months
JBoss Tools SVN: r40875 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-09 12:56:27 -0400 (Wed, 09 May 2012)
New Revision: 40875
Modified:
trunk/build/target-platform/jbds.target
Log:
use newer versions of javax.servlet.jsp and javax.servlet from JBT TP on JBDS TP
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-05-09 15:52:33 UTC (rev 40874)
+++ trunk/build/target-platform/jbds.target 2012-05-09 16:56:27 UTC (rev 40875)
@@ -265,8 +265,8 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="5.5.17.v201101211617"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.servlet" version="2.5.0.v201103041518"/>
- <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
+ <unit id="javax.servlet" version="3.0.0.v201103241727"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
<unit id="javax.el" version="2.2.0.v201105051105"/>
12 years, 8 months
JBoss Tools SVN: r40874 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-09 11:52:33 -0400 (Wed, 09 May 2012)
New Revision: 40874
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-11777] not updating models and targets of the databinding context when we create a jenkins app (using the WizardUtils#runInWizard(job) overload that does not take the databinding context to trigger an update on the models and targets it has)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-09 15:42:13 UTC (rev 40873)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-09 15:52:33 UTC (rev 40874)
@@ -520,7 +520,7 @@
}
}
- }, getContainer(), getDataBindingContext());
+ }, getContainer());
} catch (Exception e) {
// ignore
}
12 years, 8 months
JBoss Tools SVN: r40873 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-09 11:42:13 -0400 (Wed, 09 May 2012)
New Revision: 40873
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
Log:
[JBIDE-11563] fixed typo
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-05-09 13:39:56 UTC (rev 40872)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-05-09 15:42:13 UTC (rev 40873)
@@ -124,7 +124,7 @@
// we shouldn't get here, the UI should validate the remote name and
// inform about an error in this case
throw new OpenShiftUIException(
- "Could not enable OpenShift on project \"{0}\". There already is a remote called \"{1}\" that points to a differnt git repository.",
+ "Could not enable OpenShift on project \"{0}\". There already is a remote called \"{1}\" that points to a different git repository.",
project.getName(), remoteName);
}
12 years, 8 months