JBoss Tools SVN: r41729 - in trunk: download.jboss.org/jbosstools/updates/indigo/SR2 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-05 17:03:19 -0400 (Tue, 05 Jun 2012)
New Revision: 41729
Modified:
trunk/build/parent/pom.xml
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
Log:
JBDS-2188 switch to http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-06-05 21:02:48 UTC (rev 41728)
+++ trunk/build/parent/pom.xml 2012-06-05 21:03:19 UTC (rev 41729)
@@ -78,7 +78,7 @@
<requirement.build.root>${requirements.root}/target</requirement.build.root>
<!-- JBIDE-11700, JBIDE-11865: latest stable build of m2e-apt for use with JBDS product builds -->
- <m2e-apt>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</m2e-apt>
+ <m2e-apt>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</m2e-apt>
</properties>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-06-05 21:02:48 UTC (rev 41728)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-06-05 21:03:19 UTC (rev 41729)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1338838210000'/>
+<property name='p2.timestamp' value='1338930074000'/>
</properties>
<children size='15'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -18,7 +18,7 @@
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
<child location='../../requirements/m2eclipse/20120531-1100/'/>
-<child location='../../requirements/m2eclipse/m2e-apt-1.0.0-2012-06-04_15-08-51-H14/'/>
+<child location='../../requirements/m2eclipse/m2e-apt-1.0.0-2012-06-05_16-15-59-H16/'/>
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
<child location='../../requirements/orbit/R20120119162704/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-06-05 21:02:48 UTC (rev 41728)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-06-05 21:03:19 UTC (rev 41729)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1338838210000'/>
+<property name='p2.timestamp' value='1338930078000'/>
</properties>
<children size='15'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -18,7 +18,7 @@
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
<child location='../../requirements/m2eclipse/20120531-1100/'/>
-<child location='../../requirements/m2eclipse/m2e-apt-1.0.0-2012-06-04_15-08-51-H14/'/>
+<child location='../../requirements/m2eclipse/m2e-apt-1.0.0-2012-06-05_16-15-59-H16/'/>
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
<child location='../../requirements/orbit/R20120119162704/'/>
13 years, 4 months
JBoss Tools SVN: r41727 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-06-05 16:57:38 -0400 (Tue, 05 Jun 2012)
New Revision: 41727
Added:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationMessage.java
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
Added: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationMessage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationMessage.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationMessage.java 2012-06-05 20:57:38 UTC (rev 41727)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.validation;
+
+import java.util.Locale;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.wst.validation.internal.core.Message;
+import org.jboss.tools.common.CommonPlugin;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class ValidationMessage extends Message {
+
+ private String message;
+
+ public ValidationMessage(int severity, String message, IFile file) {
+ super(CommonPlugin.PLUGIN_ID, severity, message, null, file);
+ this.message = message;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.wst.validation.internal.core.Message#getText(java.util.Locale, java.lang.ClassLoader)
+ */
+ @Override
+ public java.lang.String getText(Locale locale, ClassLoader classLoader) {
+ return message;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationMessage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 4 months
JBoss Tools SVN: r41726 - trunk/build/publish.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-05 16:57:25 -0400 (Tue, 05 Jun 2012)
New Revision: 41726
Modified:
trunk/build/publish/publish.sh
Log:
JBDS-2197 put new sources zip into installer/ folder for now
Modified: trunk/build/publish/publish.sh
===================================================================
--- trunk/build/publish/publish.sh 2012-06-05 20:56:42 UTC (rev 41725)
+++ trunk/build/publish/publish.sh 2012-06-05 20:57:25 UTC (rev 41726)
@@ -167,19 +167,29 @@
done
fi
-# create sources zip
-pushd ${WORKSPACE}/sources
-mkdir -p ${STAGINGDIR}/all
-if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
- srczipname=${SRCSNAME/-Sources-/-Additional-Sources-}
+productSourcesZip="$(find ${WORKSPACE}/sources/product/sources/target -type f -name "jbdevstudio-product-sources-*.zip")"
+if [[ $productSourcesZip ]]; then
+ # for now, but the JBDS sources into the /installer/ folder
+ for z in $productSourcesZip; do
+ mkdir -p ${STAGINGDIR}/installer/
+ rsync -aq $z ${STAGINGDIR}/installer/
+ for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
+ done
else
- srczipname=${SRCSNAME}
+ # create sources zip
+ pushd ${WORKSPACE}/sources
+ mkdir -p ${STAGINGDIR}/all
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
+ srczipname=${SRCSNAME/-Sources-/-Additional-Sources-}
+ else
+ srczipname=${SRCSNAME}
+ fi
+ zip ${STAGINGDIR}/all/${srczipname} -q -r * -x hudson_workspace\* -x documentation\* -x download.jboss.org\* -x requirements\* \
+ -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
+ -x \*docs\* -x \*reference\* -x \*releng\* -x \*.git\* -x \*/lib/\*.jar
+ popd
+ z=${STAGINGDIR}/all/${srczipname}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
fi
-zip ${STAGINGDIR}/all/${srczipname} -q -r * -x hudson_workspace\* -x documentation\* -x download.jboss.org\* -x requirements\* \
- -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
- -x \*docs\* -x \*reference\* -x \*releng\* -x \*.git\* -x \*/lib/\*.jar
-popd
-z=${STAGINGDIR}/all/${srczipname}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
mkdir -p ${STAGINGDIR}/logs
13 years, 4 months
JBoss Tools SVN: r41725 - branches/jbosstools-3.3.x/build/publish.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-05 16:56:42 -0400 (Tue, 05 Jun 2012)
New Revision: 41725
Modified:
branches/jbosstools-3.3.x/build/publish/publish.sh
Log:
JBDS-2197 put new sources zip into installer/ folder for now
Modified: branches/jbosstools-3.3.x/build/publish/publish.sh
===================================================================
--- branches/jbosstools-3.3.x/build/publish/publish.sh 2012-06-05 17:15:34 UTC (rev 41724)
+++ branches/jbosstools-3.3.x/build/publish/publish.sh 2012-06-05 20:56:42 UTC (rev 41725)
@@ -167,19 +167,29 @@
done
fi
-# create sources zip
-pushd ${WORKSPACE}/sources
-mkdir -p ${STAGINGDIR}/all
-if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
- srczipname=${SRCSNAME/-Sources-/-Additional-Sources-}
+productSourcesZip="$(find ${WORKSPACE}/sources/product/sources/target -type f -name "jbdevstudio-product-sources-*.zip")"
+if [[ $productSourcesZip ]]; then
+ # for now, but the JBDS sources into the /installer/ folder
+ for z in $productSourcesZip; do
+ mkdir -p ${STAGINGDIR}/installer/
+ rsync -aq $z ${STAGINGDIR}/installer/
+ for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
+ done
else
- srczipname=${SRCSNAME}
+ # create sources zip
+ pushd ${WORKSPACE}/sources
+ mkdir -p ${STAGINGDIR}/all
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
+ srczipname=${SRCSNAME/-Sources-/-Additional-Sources-}
+ else
+ srczipname=${SRCSNAME}
+ fi
+ zip ${STAGINGDIR}/all/${srczipname} -q -r * -x hudson_workspace\* -x documentation\* -x download.jboss.org\* -x requirements\* \
+ -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
+ -x \*docs\* -x \*reference\* -x \*releng\* -x \*.git\* -x \*/lib/\*.jar
+ popd
+ z=${STAGINGDIR}/all/${srczipname}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
fi
-zip ${STAGINGDIR}/all/${srczipname} -q -r * -x hudson_workspace\* -x documentation\* -x download.jboss.org\* -x requirements\* \
- -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
- -x \*docs\* -x \*reference\* -x \*releng\* -x \*.git\* -x \*/lib/\*.jar
-popd
-z=${STAGINGDIR}/all/${srczipname}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
mkdir -p ${STAGINGDIR}/logs
13 years, 4 months
JBoss Tools SVN: r41724 - branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-06-05 13:15:34 -0400 (Tue, 05 Jun 2012)
New Revision: 41724
Modified:
branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
Log:
JBIDE-12099 npe fix for content assist
Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
===================================================================
--- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-05 17:15:32 UTC (rev 41723)
+++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-05 17:15:34 UTC (rev 41724)
@@ -133,7 +133,7 @@
final ITypedRegion region = getRegion(javaContext);
String matchValue = javaContext.getDocument().get(region.getOffset(),
javaContext.getInvocationOffset() - region.getOffset());
- if (matchValue.charAt(0) == '\"') {
+ if (!matchValue.isEmpty() && matchValue.charAt(0) == '\"') {
matchValue = matchValue.substring(1);
}
List<String> proposals = resourceMethod.getPathParamValueProposals();
13 years, 4 months
JBoss Tools SVN: r41723 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-06-05 13:15:32 -0400 (Tue, 05 Jun 2012)
New Revision: 41723
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java
Log:
[JBIDE-12034] avoiding NPE when displaying embedded cartridges that dont have an URL
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java 2012-06-05 17:14:56 UTC (rev 41722)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java 2012-06-05 17:15:32 UTC (rev 41723)
@@ -65,7 +65,7 @@
textStyle.underline = true;
}
};
- StyledString styledString = new StyledString(property.getValue(), style);
+ StyledString styledString = new StyledString(StringUtils.null2emptyString(property.getValue()), style);
cell.setStyleRanges(styledString.getStyleRanges());
cell.setText(styledString.getString());
}
13 years, 4 months
JBoss Tools SVN: r41722 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-06-05 13:14:56 -0400 (Tue, 05 Jun 2012)
New Revision: 41722
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
Log:
JBIDE-12099 npe fix for content assist
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-05 16:58:12 UTC (rev 41721)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-05 17:14:56 UTC (rev 41722)
@@ -133,7 +133,7 @@
final ITypedRegion region = getRegion(javaContext);
String matchValue = javaContext.getDocument().get(region.getOffset(),
javaContext.getInvocationOffset() - region.getOffset());
- if (matchValue.charAt(0) == '\"') {
+ if (!matchValue.isEmpty() && matchValue.charAt(0) == '\"') {
matchValue = matchValue.substring(1);
}
List<String> proposals = resourceMethod.getPathParamValueProposals();
13 years, 4 months
JBoss Tools SVN: r41721 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-06-05 12:58:12 -0400 (Tue, 05 Jun 2012)
New Revision: 41721
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
JBIDE-12097 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2012-06-05 16:57:54 UTC (rev 41720)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2012-06-05 16:58:12 UTC (rev 41721)
@@ -195,7 +195,7 @@
} catch (JBoss7ManangerConnectException e) {
return true;
} catch (Exception e) {
- return false;
+ return true;
}
}
13 years, 4 months