JBoss Tools SVN: r42557 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 19:49:27 -0400 (Thu, 12 Jul 2012)
New Revision: 42557
Modified:
trunk/build/target-platform/unified.target
Log:
add missing features/IUs from Eclipse 3.8 to TP
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 23:49:18 UTC (rev 42556)
+++ trunk/build/target-platform/unified.target 2012-07-12 23:49:27 UTC (rev 42557)
@@ -6,11 +6,11 @@
using vi, apply this transform:
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
- <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno -->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
+ <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0..."/>
<!-- for these IUs we need multiple versions -->
@@ -25,7 +25,7 @@
<unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
<!-- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/> -->
- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v200806031607"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl" version="1.5.1.v201012040544"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
@@ -108,6 +108,8 @@
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
+ <!-- need two versions here to include org.eclipse.update.ui, which is only on the 3.8 site -->
+ <unit id="org.eclipse.platform.feature.group" version="3.8.0.v20120607-071945-9gF7jI7nG5qByXMVdkhRMWBQlF4PnDCLybDCPQ"/>
<unit id="org.eclipse.platform.feature.group" version="4.2.0.v20120608-135145-9JF7BHV8FyMteji0Oi_ePMz0xuZ8TVo7lV0z0ecb"/>
<unit id="org.eclipse.platform.ide" version="4.2.0.I20120608-1400"/>
<unit id="org.eclipse.platform.sdk" version="4.2.0.I20120608-1400"/>
@@ -131,6 +133,13 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.0.v20120528-1648-7IAPA7BrHQicRpNdOz-Obz-rlRCA"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7vFitFFt6Zr5a12MM4IKMFZ"/>
<unit id="org.eclipse.help.feature.group" version="1.4.0.v20120608-133537-8P7vFOTFK_Qj4JmDIQXL8Tn"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/>
<unit id="org.eclipse.update.core" version="3.2.600.v20120530-1204"/>
<!-- DTP -->
@@ -356,6 +365,8 @@
</location>
</locations>
<includeBundles>
+ <!-- JBIDE-12292 include m2e.wtp like a component, rather than an upstream dependency -->
+ <feature id="org.eclipse.m2e.wtp.feature"/>
<feature id="org.mozilla.xulrunner.feature"/>
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
13 years, 9 months
JBoss Tools SVN: r42556 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 19:49:18 -0400 (Thu, 12 Jul 2012)
New Revision: 42556
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
Log:
add missing features/IUs from Eclipse 3.8 to TP; merge jbds.target and multiple.target so they're the same file
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-07-12 22:26:17 UTC (rev 42555)
+++ trunk/build/target-platform/jbds.target 2012-07-12 23:49:18 UTC (rev 42556)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
-<target includeMode="feature" name="jbds6">
+<target includeMode="feature" name="e42-wtp34-jbds6">
<!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
@@ -107,6 +107,8 @@
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
+ <!-- need two versions here to include org.eclipse.update.ui, which is only on the 3.8 site -->
+ <unit id="org.eclipse.platform.feature.group" version="3.8.0.v20120607-071945-9gF7jI7nG5qByXMVdkhRMWBQlF4PnDCLybDCPQ"/>
<unit id="org.eclipse.platform.feature.group" version="4.2.0.v20120608-135145-9JF7BHV8FyMteji0Oi_ePMz0xuZ8TVo7lV0z0ecb"/>
<unit id="org.eclipse.platform.ide" version="4.2.0.I20120608-1400"/>
<unit id="org.eclipse.platform.sdk" version="4.2.0.I20120608-1400"/>
@@ -130,6 +132,13 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.0.v20120528-1648-7IAPA7BrHQicRpNdOz-Obz-rlRCA"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7vFitFFt6Zr5a12MM4IKMFZ"/>
<unit id="org.eclipse.help.feature.group" version="1.4.0.v20120608-133537-8P7vFOTFK_Qj4JmDIQXL8Tn"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/>
<unit id="org.eclipse.update.core" version="3.2.600.v20120530-1204"/>
<!-- DTP -->
@@ -354,4 +363,11 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
</location>
</locations>
+ <includeBundles>
+ <!-- JBIDE-12292 include m2e.wtp like a component, rather than an upstream dependency -->
+ <feature id="org.eclipse.m2e.wtp.feature"/>
+ <feature id="org.mozilla.xulrunner.feature"/>
+ <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>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 22:26:17 UTC (rev 42555)
+++ trunk/build/target-platform/multiple.target 2012-07-12 23:49:18 UTC (rev 42556)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
-<target includeMode="feature" name="e42-wtp34">
+<target includeMode="feature" name="e42-wtp34-jbds6">
<!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
using vi, apply this transform:
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
- <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno -->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
@@ -108,6 +107,8 @@
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
+ <!-- need two versions here to include org.eclipse.update.ui, which is only on the 3.8 site -->
+ <unit id="org.eclipse.platform.feature.group" version="3.8.0.v20120607-071945-9gF7jI7nG5qByXMVdkhRMWBQlF4PnDCLybDCPQ"/>
<unit id="org.eclipse.platform.feature.group" version="4.2.0.v20120608-135145-9JF7BHV8FyMteji0Oi_ePMz0xuZ8TVo7lV0z0ecb"/>
<unit id="org.eclipse.platform.ide" version="4.2.0.I20120608-1400"/>
<unit id="org.eclipse.platform.sdk" version="4.2.0.I20120608-1400"/>
@@ -131,6 +132,13 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.0.v20120528-1648-7IAPA7BrHQicRpNdOz-Obz-rlRCA"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7vFitFFt6Zr5a12MM4IKMFZ"/>
<unit id="org.eclipse.help.feature.group" version="1.4.0.v20120608-133537-8P7vFOTFK_Qj4JmDIQXL8Tn"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/>
<unit id="org.eclipse.update.core" version="3.2.600.v20120530-1204"/>
<!-- DTP -->
@@ -356,6 +364,8 @@
</location>
</locations>
<includeBundles>
+ <!-- JBIDE-12292 include m2e.wtp like a component, rather than an upstream dependency -->
+ <feature id="org.eclipse.m2e.wtp.feature"/>
<feature id="org.mozilla.xulrunner.feature"/>
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
13 years, 9 months
JBoss Tools SVN: r42555 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-12 18:26:17 -0400 (Thu, 12 Jul 2012)
New Revision: 42555
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
trunk/documentation/guides/GettingStartedGuide/en-US/minimumrequirements.xml
Log:
updated for TOOLSDOC-283
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-12 21:48:26 UTC (rev 42554)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-12 22:26:17 UTC (rev 42555)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.1</edition>
-<pubsnumber>33</pubsnumber>
+<pubsnumber>34</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/minimumrequirements.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/minimumrequirements.xml 2012-07-12 21:48:26 UTC (rev 42554)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/minimumrequirements.xml 2012-07-12 22:26:17 UTC (rev 42555)
@@ -17,10 +17,16 @@
<para>Microsoft Windows XP (x86_64) running 64-bit Sun JDK 6 (*)</para>
</listitem>
<listitem>
+ <para>MacOS X 10.7 running 32-bit Apple JDK 6</para>
+ </listitem>
+ <listitem>
+ <para>MacOS X 10.7 running 64-bit Apple JDK 6 (*)</para>
+ </listitem>
+ <listitem>
<para>MacOS X 10.6 running 32-bit Apple JDK 6</para>
</listitem>
<listitem>
- <para>MacOS X 10.5 running 64-bit Apple JDK 6 (*)</para>
+ <para>MacOS X 10.6 running 64-bit Apple JDK 6 (*)</para>
</listitem>
<listitem>
<para>Red Hat Enterprise Linux 6 i386 running 32-bit Sun JDK 6 and OpenJDK 6</para>
13 years, 9 months
JBoss Tools SVN: r42554 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-07-12 17:48:26 -0400 (Thu, 12 Jul 2012)
New Revision: 42554
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml
Log:
updated for TOOLSDOC-245
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-12 18:49:09 UTC (rev 42553)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-07-12 21:48:26 UTC (rev 42554)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.1</edition>
-<pubsnumber>32</pubsnumber>
+<pubsnumber>33</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2012-07-12 18:49:09 UTC (rev 42553)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2012-07-12 21:48:26 UTC (rev 42554)
@@ -355,49 +355,30 @@
</figure>
<para>
- This step lets you configure locally available JBoss servers:
+ This step lets you select a location that will be used to search for locally available JBoss servers upon first running of JBoss Developer Studio:
</para>
<figure>
- <title>Configuring a JBoss Enterprise Application Platform installation</title>
+ <title>Selecting a location to search for JBoss servers</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/getting_started/getting_started_3.png"/>
</imageobject>
</mediaobject>
</figure>
-
+
<para>
- You can fill the list automatically using the
+ To add a location click on the <guibutton>Add</guibutton> button. When the
<guibutton>
- Find
+ Add
</guibutton>
- button. When the
- <guibutton>
- Find
- </guibutton>
button is clicked you are prompted to select the folder from which to search for available JBoss Application Servers. Click the
<guibutton>
OK
</guibutton>
- button to select the chosen folder.
+ button to select the chosen location. This location and subsequent directories will be searched for any JBoss server instances when you launch JBoss Developer Studio.
</para>
<!--
- <figure>
- <title>Finding Servers in the Selected Directory</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/getting_started/getting_started_3_3_1.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para/> -->
-
- <para>
- All found servers will be added to the list with the following details: Name, Type, Version and Location.
- </para>
- <!--
<itemizedlist>
<listitem>
<para>
13 years, 9 months
JBoss Tools SVN: r42553 - trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-12 14:49:09 -0400 (Thu, 12 Jul 2012)
New Revision: 42553
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Make Quick Fix "Add @SuppressWarnings" work on Temporary annotations https://issues.jboss.org/browse/JBIDE-12303
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-07-12 16:51:47 UTC (rev 42552)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-07-12 18:49:09 UTC (rev 42553)
@@ -90,6 +90,8 @@
// Find annotation
TempJavaProblemAnnotation[] annotations = waitForProblemAnnotationAppearance(viewer);
+ Assert.assertTrue("No annotations found", annotations.length > 0);
+
for(TempJavaProblemAnnotation annotation : annotations){
IJavaCompletionProposal[] proposals = getCompletionProposals(annotation);
checkForConfigureProblemSeverity(proposals);
13 years, 9 months
JBoss Tools SVN: r42552 - branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-07-12 12:51:47 -0400 (Thu, 12 Jul 2012)
New Revision: 42552
Modified:
branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
Log:
JBIDE-12327 - Fix for WS Tester to better handle already-prefixed namespaces when processing SOAP request messages (for 3.3.x stream)
Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
===================================================================
--- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2012-07-12 16:50:10 UTC (rev 42551)
+++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2012-07-12 16:51:47 UTC (rev 42552)
@@ -872,6 +872,9 @@
}
String tnsprefix = uri.substring(uri.indexOf("://") + 3, uri.length()); //$NON-NLS-1$
+ if (tnsprefix.contains(":")) {//$NON-NLS-1$
+ tnsprefix = uri.substring(0, uri.indexOf(':'));
+ }
if (tnsprefix.length() > 4) {
if (tnsprefix.endsWith("/")) { //$NON-NLS-1$
tnsprefix = tnsprefix.substring(0, tnsprefix.length() - 1);
13 years, 9 months
JBoss Tools SVN: r42551 - trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-07-12 12:50:10 -0400 (Thu, 12 Jul 2012)
New Revision: 42551
Modified:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java
Log:
JBIDE-10738 As-you-type EL validation
JUnit Tests are fixed.
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java 2012-07-12 16:48:41 UTC (rev 42550)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java 2012-07-12 16:50:10 UTC (rev 42551)
@@ -32,7 +32,7 @@
*/
@SuppressWarnings("restriction")
public class BaseAsYouTypeInJavaValidationTest extends AbstractAsYouTypeValidationTest {
- public static final String MARKER_TYPE = "org.jboss.tools.common.validation.el"; //$NON-NLS-1$
+ public static final String MARKER_TYPE = "org.jboss.tools.common.validation.temp"; //$NON-NLS-1$
public static final String RESOURCE_MARKER_TYPE = "org.jboss.tools.jst.web.kb.elproblem"; //$NON-NLS-1$
public BaseAsYouTypeInJavaValidationTest(IProject project) {
13 years, 9 months
JBoss Tools SVN: r42550 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-07-12 12:48:41 -0400 (Thu, 12 Jul 2012)
New Revision: 42550
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
Log:
JBIDE-12327 - Fix for WS Tester to better handle already-prefixed namespaces when processing SOAP request messages
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2012-07-12 16:32:57 UTC (rev 42549)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2012-07-12 16:48:41 UTC (rev 42550)
@@ -872,6 +872,9 @@
}
String tnsprefix = uri.substring(uri.indexOf("://") + 3, uri.length()); //$NON-NLS-1$
+ if (tnsprefix.contains(":")) {//$NON-NLS-1$
+ tnsprefix = uri.substring(0, uri.indexOf(':'));
+ }
if (tnsprefix.length() > 4) {
if (tnsprefix.endsWith("/")) { //$NON-NLS-1$
tnsprefix = tnsprefix.substring(0, tnsprefix.length() - 1);
13 years, 9 months
JBoss Tools SVN: r42549 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:32:57 -0400 (Thu, 12 Jul 2012)
New Revision: 42549
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
fix versions of junit
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-07-12 16:29:44 UTC (rev 42548)
+++ trunk/build/target-platform/jbds.target 2012-07-12 16:32:57 UTC (rev 42549)
@@ -35,8 +35,8 @@
<unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
<unit id="org.apache.lucene" version="2.9.1.v201101211721"/>
<unit id="org.apache.lucene" version="1.9.1.v201101211617"/>
- <unit id="org.junit_4.8.2.v4_8" version="2_v20110321-1705"/>
- <unit id="org.junit_3.8.2.v3_8" version="2_v20100427-1100"/>
+ <unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
+ <unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 16:29:44 UTC (rev 42548)
+++ trunk/build/target-platform/multiple.target 2012-07-12 16:32:57 UTC (rev 42549)
@@ -36,8 +36,8 @@
<unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
<unit id="org.apache.lucene" version="2.9.1.v201101211721"/>
<unit id="org.apache.lucene" version="1.9.1.v201101211617"/>
- <unit id="org.junit_4.8.2.v4_8" version="2_v20110321-1705"/>
- <unit id="org.junit_3.8.2.v3_8" version="2_v20100427-1100"/>
+ <unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
+ <unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 16:29:44 UTC (rev 42548)
+++ trunk/build/target-platform/unified.target 2012-07-12 16:32:57 UTC (rev 42549)
@@ -36,8 +36,8 @@
<unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
<unit id="org.apache.lucene" version="2.9.1.v201101211721"/>
<unit id="org.apache.lucene" version="1.9.1.v201101211617"/>
- <unit id="org.junit_4.8.2.v4_8" version="2_v20110321-1705"/>
- <unit id="org.junit_3.8.2.v3_8" version="2_v20100427-1100"/>
+ <unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
+ <unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
13 years, 9 months
JBoss Tools SVN: r42548 - in trunk/maven: features and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-07-12 12:29:44 -0400 (Thu, 12 Jul 2012)
New Revision: 42548
Modified:
trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml
trunk/maven/features/org.jboss.tools.maven.gwt.feature/pom.xml
trunk/maven/features/org.jboss.tools.maven.sourcelookup.feature/
trunk/maven/features/pom.xml
trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.gwt/pom.xml
trunk/maven/plugins/pom.xml
trunk/maven/pom.xml
trunk/maven/site/category.xml
Log:
https://issues.jboss.org/browse/JBIDE-12287 add GWT features back into JBT
fixed in JBT
Modified: trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml 2012-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/features/org.jboss.tools.maven.gwt.feature/feature.xml 2012-07-12 16:29:44 UTC (rev 42548)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.maven.gwt.feature"
label="%featureName"
- version="1.3.0.qualifier"
+ version="1.4.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.maven.gwt">
Modified: trunk/maven/features/org.jboss.tools.maven.gwt.feature/pom.xml
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.gwt.feature/pom.xml 2012-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/features/org.jboss.tools.maven.gwt.feature/pom.xml 2012-07-12 16:29:44 UTC (rev 42548)
@@ -5,11 +5,10 @@
<parent>
<groupId>org.jboss.tools.maven</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.maven.features</groupId>
<artifactId>org.jboss.tools.maven.gwt.feature</artifactId>
-
<packaging>eclipse-feature</packaging>
<build>
Property changes on: trunk/maven/features/org.jboss.tools.maven.sourcelookup.feature
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/maven/features/pom.xml
===================================================================
--- trunk/maven/features/pom.xml 2012-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/features/pom.xml 2012-07-12 16:29:44 UTC (rev 42548)
@@ -25,8 +25,8 @@
<module>org.jboss.tools.maven.jbosspackaging.feature</module>
<module>org.jboss.tools.maven.jpa.feature</module>
<module>org.jboss.tools.maven.profiles.feature</module>
- <!-- JBIDE-12287 temporarily removed <module>org.jboss.tools.maven.gwt.feature</module> -->
+ <module>org.jboss.tools.maven.gwt.feature</module>
<module>org.jboss.tools.maven.sourcelookup.feature</module>
- <module>org.jboss.tools.maven.jdt.feature</module>
+ <module>org.jboss.tools.maven.jdt.feature</module>
</modules>
</project>
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-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/META-INF/MANIFEST.MF 2012-07-12 16:29:44 UTC (rev 42548)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.maven.gwt;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.jboss.tools.maven.gwt.MavenGWTPlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.m2e.core;bundle-version="[1.0.200,1.2.0)",
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/pom.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/pom.xml 2012-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/pom.xml 2012-07-12 16:29:44 UTC (rev 42548)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.maven</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.maven.plugins</groupId>
<artifactId>org.jboss.tools.maven.gwt</artifactId>
Modified: trunk/maven/plugins/pom.xml
===================================================================
--- trunk/maven/plugins/pom.xml 2012-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/plugins/pom.xml 2012-07-12 16:29:44 UTC (rev 42548)
@@ -27,7 +27,7 @@
<module>org.jboss.tools.maven.jpa</module>
<module>org.jboss.tools.maven.profiles.core</module>
<module>org.jboss.tools.maven.profiles.ui</module>
- <!-- JBIDE-12287 temporarily removed <module>org.jboss.tools.maven.gwt</module> -->
+ <module>org.jboss.tools.maven.gwt</module>
<module>org.jboss.tools.maven.sourcelookup.core</module>
<module>org.jboss.tools.maven.sourcelookup.ui</module>
<module>org.jboss.tools.maven.jdt</module>
Modified: trunk/maven/pom.xml
===================================================================
--- trunk/maven/pom.xml 2012-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/pom.xml 2012-07-12 16:29:44 UTC (rev 42548)
@@ -11,7 +11,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>maven</artifactId>
<version>1.4.0-SNAPSHOT</version>
- <name>maven.all</name>
+ <name>maven.all</name>
<packaging>pom</packaging>
<modules>
<module>features</module>
@@ -19,10 +19,24 @@
<module>tests</module>
<module>site</module>
</modules>
+ <repositories>
+ <repository>
+ <id>jbosstools-m2e-wtp-mirror</id>
+ <layout>p2</layout>
+ <url>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-w...</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<build>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Modified: trunk/maven/site/category.xml
===================================================================
--- trunk/maven/site/category.xml 2012-07-12 16:29:22 UTC (rev 42547)
+++ trunk/maven/site/category.xml 2012-07-12 16:29:44 UTC (rev 42548)
@@ -41,9 +41,9 @@
<feature url="features/org.jboss.tools.maven.profiles.feature_0.0.0.jar" id="org.jboss.tools.maven.profiles.feature" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
</feature>
- <!-- JBIDE-12287 <feature url="features/org.jboss.tools.maven.gwt.feature_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.maven.gwt.feature_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
- </feature> -->
+ </feature>
<feature url="features/org.jboss.tools.maven.sourcelookup.feature_0.0.0.jar" id="org.jboss.tools.maven.sourcelookup.feature" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
</feature>
@@ -87,9 +87,9 @@
<feature url="features/org.jboss.tools.maven.profiles.feature.source_0.0.0.jar" id="org.jboss.tools.maven.profiles.feature.source" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
</feature>
- <!-- JBIDE-12287 <feature url="features/org.jboss.tools.maven.gwt.feature.source_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature.source" version="0.0.0">
+ <feature url="features/org.jboss.tools.maven.gwt.feature.source_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature.source" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
- </feature> -->
+ </feature>
<feature url="features/org.jboss.tools.maven.sourcelookup.feature.source_0.0.0.jar" id="org.jboss.tools.maven.sourcelookup.feature.source" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
</feature>
13 years, 9 months