JBoss Tools SVN: r37241 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 16:24:12 -0500 (Mon, 12 Dec 2011)
New Revision: 37241
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
add other SpringIDE features to SpringIDE connector (JBDS-1966)
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:03:26 UTC (rev 37240)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 21:24:12 UTC (rev 37241)
@@ -348,9 +348,16 @@
id="org.springframework.ide.eclipse.feature"
kind="task"
license="Free, EPL, Other"
- name="Spring IDE Core"
+ name="Spring IDE"
provider="Spring IDE Developers"
siteUrl="http://download.jboss.org/jbosstools/updates/indigo/extras/">
+ <iu id="org.springframework.ide.eclipse.aop.feature"/>
+ <iu id="org.springframework.ide.eclipse.autowire.feature"/>
+ <iu id="org.springframework.ide.eclipse.feature"/>
+ <iu id="org.springframework.ide.eclipse.integration.feature"/>
+ <iu id="org.springframework.ide.eclipse.osgi.feature"/>
+ <iu id="org.springframework.ide.eclipse.webflow.feature"/>
+ <iu id="org.springframework.ide.eclipse.security.feature"/>
<icon
image32="images/springide_32.png">
</icon>
14 years, 4 months
JBoss Tools SVN: r37240 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-12 16:03:26 -0500 (Mon, 12 Dec 2011)
New Revision: 37240
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-12 21:01:04 UTC (rev 37239)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-12 21:03:26 UTC (rev 37240)
@@ -23,6 +23,7 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
+import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceReference;
import org.eclipse.jdt.core.JavaCore;
@@ -47,40 +48,87 @@
*/
public class AddSuppressWarningsMarkerResolution implements
IMarkerResolution2 {
+ public static final String SUPPRESS_WARNINGS_ANNOTATION = "SuppressWarnings";
public static final String SPACE = " "; //$NON-NLS-1$
public static final String AT = "@"; //$NON-NLS-1$
private static final String PROBLEM_ID = JavaCore.COMPILER_PB_UNHANDLED_WARNING_TOKEN;
private SP preferences = new SP();
private IFile file;
- private IJavaElement element;
+ private IAnnotatable element;
private String preferenceKey;
private String label;
public AddSuppressWarningsMarkerResolution(IFile file, IJavaElement element, String preferenceKey){
this.file = file;
- this.element = element;
+ this.element = getAnnatatableElement(element);
this.preferenceKey = preferenceKey;
label = NLS.bind(CommonUIMessages.ADD_SUPPRESS_WARNINGS, element.getElementName());
}
+
+ private IAnnotatable getAnnatatableElement(IJavaElement element){
+ IJavaElement elem = element;
+ while(elem != null){
+ if(element instanceof IAnnotatable){
+ return (IAnnotatable) element;
+ }
+ elem = elem.getParent();
+ }
+ return null;
+ }
+ @Override
public String getLabel() {
return label;
}
+ @Override
public void run(IMarker marker) {
- addSuppressWarningsAnnotation();
+ if(element != null){
+ disablePreference();
+
+ IAnnotation annotation = findAnnotation();
+ if(annotation != null){
+ updateSuppressWarningsAnnotation(annotation);
+ }else{
+ addSuppressWarningsAnnotation();
+ }
+ }
+ }
+
+ private IAnnotation findAnnotation(){
+ IAnnotation annotation = element.getAnnotation(SUPPRESS_WARNINGS_ANNOTATION);
+ if(annotation != null && annotation.exists()){
+ return annotation;
+ }
- disablePreference();
+ return null;
}
+ private void updateSuppressWarningsAnnotation(IAnnotation annotation){
+ try {
+ ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
+ ICompilationUnit compilationUnit;
+ compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
+
+ updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
+
+ compilationUnit.commitWorkingCopy(true, new NullProgressMonitor());
+ compilationUnit.discardWorkingCopy();
+ } catch (JavaModelException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ } catch (CoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ }
+
private void addSuppressWarningsAnnotation(){
try {
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit;
compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
- addAnnotation("SuppressWarnings(\""+preferenceKey+"\")", compilationUnit, element);
+ addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, (IJavaElement)element);
compilationUnit.commitWorkingCopy(true, new NullProgressMonitor());
compilationUnit.discardWorkingCopy();
@@ -93,7 +141,7 @@
private void disablePreference(){
String value = preferences.getProjectPreference(file.getProject(), PROBLEM_ID);
- if(!preferences.IGNORE.equals(value)){
+ if(!SeverityPreferences.IGNORE.equals(value)){
MessageDialog dialog = null;
dialog = new MessageDialog(getShell(), label, null,
"Do you want to disable 'Unsupported @SuppressWarnings' error/warning on the Workspace or only on the project '"+file.getProject().getName()+"'",
@@ -102,18 +150,16 @@
0);
int result = dialog.open();
if(result == 1){
- JavaCore.getPlugin().getPluginPreferences().setValue(PROBLEM_ID, preferences.IGNORE);
- JavaCore.getPlugin().savePluginPreferences();
-// IEclipsePreferences ePrefs = preferences.getDefaultPreferences();
-// ePrefs.put(PROBLEM_ID, preferences.IGNORE);
-// try {
-// ePrefs.flush();
-// } catch (BackingStoreException e) {
-// CommonUIPlugin.getDefault().logError(e);
-// }
+ IEclipsePreferences ePrefs = preferences.getInstancePreferences();
+ ePrefs.put(PROBLEM_ID, SeverityPreferences.IGNORE);
+ try {
+ ePrefs.flush();
+ } catch (BackingStoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
}else if(result == 2){
IEclipsePreferences ePrefs = preferences.getProjectPreferences(file.getProject());
- ePrefs.put(PROBLEM_ID, preferences.IGNORE);
+ ePrefs.put(PROBLEM_ID, SeverityPreferences.IGNORE);
try {
ePrefs.flush();
} catch (BackingStoreException e) {
@@ -137,15 +183,48 @@
}
return null;
}
+ @Override
public String getDescription() {
return label;
}
+ @Override
public Image getImage() {
return JavaPlugin.getImageDescriptorRegistry().get(JavaPluginImages.DESC_OBJS_ANNOTATION);
}
- private static void addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
+ private void updateAnnotation(String name, String parameter, ICompilationUnit compilationUnit, IAnnotation annotation) throws JavaModelException{
+ IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, annotation);
+ if(workingCopyElement == null){
+ return;
+ }
+
+ if(!(workingCopyElement instanceof ISourceReference))
+ return;
+
+ ISourceReference workingCopySourceReference = (ISourceReference) workingCopyElement;
+
+ IBuffer buffer = compilationUnit.getBuffer();
+
+ String str = AT+name;
+
+ str += "({";
+
+ for(IMemberValuePair pair : annotation.getMemberValuePairs()){
+ if(pair.getValue().toString().equals(parameter)){
+ return;
+ }
+ str += "\""+pair.getValue()+"\", ";
+ }
+
+ str += "\""+parameter+"\"";
+
+ str += "})";
+
+ buffer.replace(workingCopySourceReference.getSourceRange().getOffset(), workingCopySourceReference.getSourceRange().getLength(), str);
+ }
+
+ private void addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element);
if(workingCopyElement == null){
return;
14 years, 4 months
JBoss Tools SVN: r37239 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-12 16:01:04 -0500 (Mon, 12 Dec 2011)
New Revision: 37239
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
Log:
JBIDE-9850 feeds should be cached so it doesnt show blank when opening up the second time
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2011-12-12 20:29:41 UTC (rev 37238)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2011-12-12 21:01:04 UTC (rev 37239)
@@ -518,6 +518,11 @@
return file;
}
}
+ if (urlModified == 0) {
+ if (file.exists()) {
+ return file;
+ }
+ }
if (file.exists()) {
long modified = file.lastModified();
if (urlModified == modified) {
14 years, 4 months
JBoss Tools SVN: r37238 - branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-12 15:29:41 -0500 (Mon, 12 Dec 2011)
New Revision: 37238
Modified:
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
Log:
[JBIDE-10447] corrected client to completely bypass the ssl checks
Modified: branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
===================================================================
--- branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2011-12-12 19:08:41 UTC (rev 37237)
+++ branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2011-12-12 20:29:41 UTC (rev 37238)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar" sourcepath="/openshift-java-client"/>
+ <classpathentry exported="true" kind="lib" path="org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar" sourcepath="/home/adietish/jboss-workspaces/openshift-java-client_andre/org.jboss.tools.openshift.express.client"/>
<classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Final.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Modified: branches/jbosstools-3.3.0.M5/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
14 years, 4 months
JBoss Tools SVN: r37237 - branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-12 14:08:41 -0500 (Mon, 12 Dec 2011)
New Revision: 37237
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
Log:
JBIDE-10450 - critical wizard fragment fix for eap6.0
Modified: branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
===================================================================
--- branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-12-12 19:05:55 UTC (rev 37236)
+++ branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-12-12 19:08:41 UTC (rev 37237)
@@ -224,7 +224,7 @@
|| (adapterVersion.equals("7.1") && version.startsWith("7.0."))) {
return NLS.bind(Messages.rwf_homeIncorrectVersionError, adapterVersion, version);
}
- if( isEAP() && (adapterVersion.equals("6.0") && version.startsWith("7.0.")))
+ if( isEAP() && (adapterVersion.equals("6.0") && !version.startsWith("7.")))
return NLS.bind(Messages.rwf_homeIncorrectVersionError, adapterVersion, version);
return null;
14 years, 4 months
JBoss Tools SVN: r37236 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-12-12 14:05:55 -0500 (Mon, 12 Dec 2011)
New Revision: 37236
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
Log:
JBIDE-10450 - wizard fragment version constraints too strong
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-12-12 18:45:22 UTC (rev 37235)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2011-12-12 19:05:55 UTC (rev 37236)
@@ -224,7 +224,7 @@
|| (adapterVersion.equals("7.1") && version.startsWith("7.0."))) {
return NLS.bind(Messages.rwf_homeIncorrectVersionError, adapterVersion, version);
}
- if( isEAP() && (adapterVersion.equals("6.0") && version.startsWith("7.0.")))
+ if( isEAP() && (adapterVersion.equals("6.0") && !version.startsWith("7.")))
return NLS.bind(Messages.rwf_homeIncorrectVersionError, adapterVersion, version);
return null;
14 years, 4 months
JBoss Tools SVN: r37235 - in trunk/download.jboss.org/jbosstools/updates/requirements: indigo and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 13:45:22 -0500 (Mon, 12 Dec 2011)
New Revision: 37235
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR...
trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build-SR1...
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S...
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
Log:
fetch newer versions of eclipse, wtp, and indigo (including RSE)
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR... (from rev 37234, trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build-SR... 2011-12-12 18:45:22 UTC (rev 37235)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/eclipse/build.xml -Ddestination=/tmp/eclipse-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20110909-1335/" />
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.7.1/" name="Eclipse 3.7" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.1/" artifactRepository="file:${destination}/3.7.1/" publishartifacts="true" source="${destination}/3.7.1/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-12-12 18:16:29 UTC (rev 37234)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-12-12 18:45:22 UTC (rev 37235)
@@ -16,13 +16,13 @@
-f ~/RHDS/updates/requirements/eclipse/build.xml -Ddestination=/tmp/eclipse-repo
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20110909-1335/" />
+ <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20111201-1437/" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.7.1/" name="Eclipse 3.7" />
+ <repository location="file:${destination}/3.7.1a/" name="Eclipse 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +30,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.1/" artifactRepository="file:${destination}/3.7.1/" publishartifacts="true" source="${destination}/3.7.1/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.1a/" artifactRepository="file:${destination}/3.7.1a/" publishartifacts="true" source="${destination}/3.7.1a/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build-SR1... (from rev 37234, trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build-SR1... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build-SR1... 2011-12-12 18:45:22 UTC (rev 37235)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/indigo/build.xml -Ddestination=/tmp/indigo-repo
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/releases/indigo/201109230900/" />
+
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/201109230900/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/201109230900-SR1/" name="Indigo 201109230900-SR1" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201109230900-SR1/" artifactRepository="file:${destination}/201109230900-SR1/" publishartifacts="true" source="${destination}/201109230900-SR1/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-12-12 18:16:29 UTC (rev 37234)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-12-12 18:45:22 UTC (rev 37235)
@@ -16,13 +16,14 @@
-f ~/RHDS/updates/requirements/indigo/build.xml -Ddestination=/tmp/indigo-repo
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/releases/indigo/201109230900/" />
+ <!-- <property name="URL" value="http://download.eclipse.org/releases/indigo/201109230900/" /> -->
+ <property name="URL" value="http://download.eclipse.org/releases/maintenance/" />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/indigo/201109230900/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/201109230900-SR1/" name="Indigo 201109230900-SR1" />
+ <repository location="file:${destination}/201112121340-SR1a/" name="Indigo 201112121340-SR1a" />
<source>
<repository location="${URL}" />
</source>
@@ -30,6 +31,6 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201109230900-SR1/" artifactRepository="file:${destination}/201109230900-SR1/" publishartifacts="true" source="${destination}/201109230900-SR1/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201112121340-SR1a/" artifactRepository="file:${destination}/201112121340-SR1a/" publishartifacts="true" source="${destination}/201112121340-SR1a/" compress="${compress}" />
</target>
</project>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S... (from rev 37234, trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build-S... 2011-12-12 18:45:22 UTC (rev 37235)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/build-indigo.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/webtools/build-indigo.xml -Ddestination=/tmp/webtools-repo
+
+ or, on local:
+
+ java -cp /home/nboldt/eclipse/eclipse361/plugins/org.eclipse.equinox.launcher_*.jar \
+ org.eclipse.equinox.launcher.Main -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner -f build-indigo.xml
+
+ -->
+ <target name="mirror">
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.1/R-3.3.1-20110..." />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.3.1-20110915193224/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
+ <source>
+ <repository location="${URL}" />
+ </source>
+
+ <slicingOptions includeFeatures="true" followStrict="true" />
+
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.1-20110915193224/" artifactRepository="file:${destination}/3.3.1-20110915193224/" publishartifacts="true" source="${destination}/3.3.1-20110915193224/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2011-12-12 18:16:29 UTC (rev 37234)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/webtools/build.xml 2011-12-12 18:45:22 UTC (rev 37235)
@@ -23,12 +23,12 @@
-->
<target name="mirror">
- <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.1/R-3.3.1-20110..." />
+ <property name="URL" value="http://download.eclipse.org/webtools/downloads/drops/R3.3.2/M-3.3.2-20111..." />
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/webtools/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.3.1-20110915193224/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
+ <repository location="file:${destination}/3.3.2-20111207200956/" name="Web Tools plugins for Eclipse 3.7 Indigo" />
<source>
<repository location="${URL}" />
</source>
@@ -37,6 +37,6 @@
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.1-20110915193224/" artifactRepository="file:${destination}/3.3.1-20110915193224/" publishartifacts="true" source="${destination}/3.3.1-20110915193224/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.3.2-20111207200956/" artifactRepository="file:${destination}/3.3.2-20111207200956/" publishartifacts="true" source="${destination}/3.3.2-20111207200956/" compress="${compress}" />
</target>
</project>
14 years, 4 months
JBoss Tools SVN: r37234 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 13:16:29 -0500 (Mon, 12 Dec 2011)
New Revision: 37234
Modified:
trunk/build/aggregate/site/site.xml
Log:
reorder site.xml to match changes to JBDS product site file; fix comments (JBDS-1960)
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-12-12 17:52:25 UTC (rev 37233)
+++ trunk/build/aggregate/site/site.xml 2011-12-12 18:16:29 UTC (rev 37234)
@@ -180,21 +180,24 @@
<category name="AbridgedTools" />
<category name="MavenTools" />
</feature>
+
+ <!-- only in JBT and JBDS Extras -->
<feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
+ <!-- only in JBT -->
<feature url="features/org.jboss.tools.gwt.feature_0.0.0.jar" id="org.jboss.tools.gwt.feature" version="0.0.0">
<category name="GeneralTools" />
</feature>
+ <feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
+ <category name="AbridgedTools" />
+ <category name="GeneralTools"/>
+ </feature>
<feature url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="GeneralTools"/>
</feature>
- <feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
- <category name="AbridgedTools" />
- <category name="GeneralTools"/>
- </feature>
<!-- include but do not categorize -->
<feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0">
14 years, 4 months
JBoss Tools SVN: r37233 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 12:52:25 -0500 (Mon, 12 Dec 2011)
New Revision: 37233
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
apply patches JBDS1962.patch_v2.txt and JBDS1957.patch_v2.txt for JBDS-1962, JBDS-1957
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 17:52:08 UTC (rev 37232)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 17:52:25 UTC (rev 37233)
@@ -206,10 +206,8 @@
name="Subclipse + SVNKit"
provider="tigris.org"
siteUrl="http://download.jboss.org/jbosstools/updates/indigo/extras/">
+ <iu id="org.tigris.subversion.subclipse"/>
<iu id="org.tigris.subversion.clientadapter.svnkit.feature"/>
- <iu id="com.sun.jna"/>
- <iu id="org.tigris.subversion.clientadapter.feature"/>
- <iu id="org.tmatesoft.svnkit"/>
<icon
image32="images/subclipse_32.gif">
</icon>
@@ -254,6 +252,7 @@
name="JRebel"
provider="zeroturnaround.org"
siteUrl="http://www.zeroturnaround.com/update-site/">
+ <iu id="org.zeroturnaround.eclipse.feature"/>
<iu id="org.zeroturnaround.eclipse.nature.feature"/>
<iu id="org.zeroturnaround.eclipse.debug.feature"/>
<iu id="org.zeroturnaround.eclipse.wtp.feature"/>
14 years, 4 months
JBoss Tools SVN: r37232 - branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-12 12:52:08 -0500 (Mon, 12 Dec 2011)
New Revision: 37232
Modified:
branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
apply patches JBDS1962.patch_v2.txt and JBDS1957.patch_v2.txt for JBDS-1962, JBDS-1957
Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 17:40:27 UTC (rev 37231)
+++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-12 17:52:08 UTC (rev 37232)
@@ -206,10 +206,8 @@
name="Subclipse + SVNKit"
provider="tigris.org"
siteUrl="http://download.jboss.org/jbosstools/updates/indigo/extras/">
+ <iu id="org.tigris.subversion.subclipse"/>
<iu id="org.tigris.subversion.clientadapter.svnkit.feature"/>
- <iu id="com.sun.jna"/>
- <iu id="org.tigris.subversion.clientadapter.feature"/>
- <iu id="org.tmatesoft.svnkit"/>
<icon
image32="images/subclipse_32.gif">
</icon>
@@ -254,6 +252,7 @@
name="JRebel"
provider="zeroturnaround.org"
siteUrl="http://www.zeroturnaround.com/update-site/">
+ <iu id="org.zeroturnaround.eclipse.feature"/>
<iu id="org.zeroturnaround.eclipse.nature.feature"/>
<iu id="org.zeroturnaround.eclipse.debug.feature"/>
<iu id="org.zeroturnaround.eclipse.wtp.feature"/>
14 years, 4 months