JBoss Tools SVN: r32042 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-10 23:26:32 -0400 (Fri, 10 Jun 2011)
New Revision: 32042
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
Log:
add more deps to jbds target for m2e installation
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-06-11 02:54:32 UTC (rev 32041)
+++ trunk/build/target-platform/jbds.target 2011-06-11 03:26:32 UTC (rev 32042)
@@ -180,6 +180,10 @@
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201106052308"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
</location>
</locations>
</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-06-11 02:54:32 UTC (rev 32041)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-06-11 03:26:32 UTC (rev 32042)
@@ -157,6 +157,10 @@
<iu id="org.slf4j.api" version=""/>
<iu id="com.ning.async-http-client" version=""/>
<iu id="org.jboss.netty" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery" version=""/>
+<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
+<iu id="org.eclipse.net4j.jms.api" version=""/>
</p2.mirror>
</target>
</project>
14 years, 10 months
JBoss Tools SVN: r32041 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-10 22:54:32 -0400 (Fri, 10 Jun 2011)
New Revision: 32041
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
remove duplicate entries and add m2e stuff to JBDS target (so it's installable from Extras site)
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-06-11 02:08:11 UTC (rev 32040)
+++ trunk/build/target-platform/jbds.target 2011-06-11 02:54:32 UTC (rev 32041)
@@ -170,6 +170,16 @@
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
+
+ <!-- m2e 1.0 / 0.13 -->
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201106020304"/>
+ <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201106052308"/>
</location>
</locations>
</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-06-11 02:08:11 UTC (rev 32040)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-06-11 02:54:32 UTC (rev 32041)
@@ -149,6 +149,14 @@
<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
+<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
+<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="ch.qos.logback.classic" version=""/>
+<iu id="ch.qos.logback.core" version=""/>
+<iu id="ch.qos.logback.slf4j" version=""/>
+<iu id="org.slf4j.api" version=""/>
+<iu id="com.ning.async-http-client" version=""/>
+<iu id="org.jboss.netty" version=""/>
</p2.mirror>
</target>
</project>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-06-11 02:08:11 UTC (rev 32040)
+++ trunk/build/target-platform/multiple.target 2011-06-11 02:54:32 UTC (rev 32041)
@@ -20,21 +20,13 @@
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201106020304"/>
- <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201106052308"/>
- <!-- probably not required per Sneja and Max
- <unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/>
- <unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/>
- <unit id="org.eclipse.epp.mpc.ui" version="1.1.0.I20110316-1744"/>
- <unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/>
- <unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/>
- <unit id="org.eclipse.epp.usagedata.ui" version="1.3.1.R201102081640"/>
- -->
+
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-06-11 02:08:11 UTC (rev 32040)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-06-11 02:54:32 UTC (rev 32041)
@@ -34,7 +34,6 @@
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
-<iu id="org.slf4j.api" version=""/>
<iu id="ch.qos.logback.classic" version=""/>
<iu id="ch.qos.logback.core" version=""/>
<iu id="ch.qos.logback.slf4j" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-06-11 02:08:11 UTC (rev 32040)
+++ trunk/build/target-platform/unified.target 2011-06-11 02:54:32 UTC (rev 32041)
@@ -20,21 +20,13 @@
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106052308"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201106020304"/>
- <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
<unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
<unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
<unit id="org.jboss.netty" version="3.2.4.Final-201106052308"/>
- <!-- probably not required per Sneja and Max
- <unit id="org.eclipse.epp.mpc.core" version="1.0.0.v20100826-2143"/>
- <unit id="org.eclipse.epp.mpc.help.ui" version="1.0.0.v20100826-2143"/>
- <unit id="org.eclipse.epp.mpc.ui" version="1.1.0.I20110316-1744"/>
- <unit id="org.eclipse.epp.usagedata.gathering" version="1.3.0.R201005261100"/>
- <unit id="org.eclipse.epp.usagedata.recording" version="1.3.0.R201005261100"/>
- <unit id="org.eclipse.epp.usagedata.ui" version="1.3.1.R201102081640"/>
- -->
+
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-06-11 02:08:11 UTC (rev 32040)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-06-11 02:54:32 UTC (rev 32041)
@@ -34,7 +34,6 @@
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
-<iu id="org.slf4j.api" version=""/>
<iu id="ch.qos.logback.classic" version=""/>
<iu id="ch.qos.logback.core" version=""/>
<iu id="ch.qos.logback.slf4j" version=""/>
14 years, 10 months
JBoss Tools SVN: r32040 - branches/jbosstools-3.2.x/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-10 22:08:11 -0400 (Fri, 10 Jun 2011)
New Revision: 32040
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
backport from trunk to 32x branch
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-06-11 01:14:52 UTC (rev 32039)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-06-11 02:08:11 UTC (rev 32040)
@@ -56,11 +56,27 @@
rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate
# JBDS-1361 - fetch XML and then sed it into plain text
-rl=${STAGINGDIR}/logs/SVN_REVISION
-rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/api/xml?wrapper=changeS..." --timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response
-sed -e "s#<module>\(http[^<>]\+\)</module><revision>\([0-9]\+\)</revision>#\1\@\2\n#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
+wgetParams="--timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response"
+rl=${STAGINGDIR}/logs/REVISION
+if [[ $(find ${WORKSPACE} -mindepth 2 -maxdepth 3 -name ".svn") ]]; then
+ # Track git source revision through hudson api: /job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=//lastBuiltRevision
+ rl=${STAGINGDIR}/logs/GIT_REVISION
+ rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml..." ${wgetParams}
+ sed -e "s#<lastBuiltRevision><SHA1>\([a-f0-9]\+\)</SHA1><branch><SHA1>\([a-f0-9]\+\)</SHA1><name>\([^<>]\+\)</name></branch></lastBuiltRevision>#\3\@\1#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
+elif [[ $(find ${WORKSPACE} -mindepth 2 -maxdepth 3 -name ".svn") ]]; then
+ # Track svn source revision through hudson api: /job/${JOB_NAME}/api/xml?wrapper=changeSet&depth=1&xpath=//build[1]/changeSet/revision
+ rl=${STAGINGDIR}/logs/SVN_REVISION
+ rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/api/xml?wrapper=changeS..." ${wgetParams}
+ if [[ $? -eq 0 ]]; then
+ sed -e "s#<module>\(http[^<>]\+\)</module><revision>\([0-9]\+\)</revision>#\1\@\2\n#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
+ else
+ echo "UNKNOWN SVN REVISION(S)" > ${rl}.txt
+ fi
+else
+ # not git or svn... unsupported
+ echo "UNKNOWN REVISION(S)" > ${rl}.txt
+fi
-
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
touch ${STAGINGDIR}/logs/${METAFILE}
METAFILE=build.properties
@@ -197,10 +213,21 @@
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
if [[ -f ${buildxml} ]]; then
ANT_SCRIPT=${buildxml}
+ RESULTS_DIR=${buildxml/\/build.xml/}
fi
done
if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_PARAMS}; fi
+# copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs
+if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then
+ for f in buildResults.html buildResults.css; do
+ if [[ -f ${RESULTS_DIR}/${f} ]]; then rsync -arzq ${RESULTS_DIR}/${f} ${STAGINGDIR}/logs/; fi
+ done
+fi
+
+# purge duplicate zip files in logs/zips/all/*.zip
+if [[ -d ${STAGINGDIR}/logs/zips ]]; then rm -f $(find ${STAGINGDIR}/logs/zips -type f -name "*.zip"); fi
+
# ${bl} is full build log; see above
mkdir -p ${STAGINGDIR}/logs
# filter out Maven test failures
14 years, 10 months
JBoss Tools SVN: r32039 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test: src/org/jboss/tools/cdi/seam/text/ext/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-06-10 21:14:52 -0400 (Fri, 10 Jun 2011)
New Revision: 32039
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java
Log:
JBIDE-9110
https://issues.jboss.org/browse/JBIDE-9110
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-06-11 01:00:17 UTC (rev 32038)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-06-11 01:14:52 UTC (rev 32039)
@@ -20,6 +20,7 @@
org.jboss.tools.tests,
org.eclipse.core.runtime,
org.eclipse.jdt.core,
+ org.eclipse.jdt.ui,
org.jboss.tools.cdi.seam.solder.core.test;bundle-version="1.0.0",
org.jboss.tools.cdi.text.ext;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-06-11 01:00:17 UTC (rev 32038)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-06-11 01:14:52 UTC (rev 32039)
@@ -32,6 +32,7 @@
TestSuite suiteConfig = new TestSuite("CDI Seam Config OpenOns Tests");
suiteConfig.addTestSuite(SeamConfigTagNameHyperlinkTest.class);
+ suiteConfig.addTestSuite(SeamConfigInjectedPointHyperlinkTest.class);
suiteAll.addTest(new SeamConfigTestSetup(suiteConfig));
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java 2011-06-11 01:00:17 UTC (rev 32038)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java 2011-06-11 01:14:52 UTC (rev 32039)
@@ -26,7 +26,7 @@
import org.jboss.tools.cdi.seam.config.core.test.SeamConfigTest;
import org.jboss.tools.cdi.seam.text.ext.CDISeamExtPlugin;
import org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigInjectedPointHyperlinkDetector;
-import org.jboss.tools.cdi.text.ext.test.HyperlinkDetectorTest;
+import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil;
import org.jboss.tools.common.util.FileUtil;
/**
@@ -81,7 +81,7 @@
FileEditorInput editorInput = new FileEditorInput(file);
- IEditorPart part = HyperlinkDetectorTest.openFileInEditor(file);
+ IEditorPart part = CDIHyperlinkTestUtil.openFileInEditor(file);
CompilationUnitEditor editor = (CompilationUnitEditor)part;
ISourceViewer viewer = editor.getViewer();
detector.setContext(editor);
14 years, 10 months
JBoss Tools SVN: r32038 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-10 21:00:17 -0400 (Fri, 10 Jun 2011)
New Revision: 32038
Modified:
trunk/build/publish.sh
Log:
improve checking for git/svn source style - can't pull config.xml w/o first logging in
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-06-11 01:00:00 UTC (rev 32037)
+++ trunk/build/publish.sh 2011-06-11 01:00:17 UTC (rev 32038)
@@ -56,22 +56,25 @@
rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate
# JBDS-1361 - fetch XML and then sed it into plain text
-rl=${STAGINGDIR}/logs/SVN_REVISION
-rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/api/xml?wrapper=changeS..." --timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response
-if [[ $? -gt 0 ]]; then
- rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/config.xml" --timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response
- if [[ $(cat ${rl}.xml | grep "git") ]]; then
- echo "GIT Sources" > ${rl}.txt
- rm -f ${rl}.txt ${rl}.xml
- # Now, track git source revision through hudson api: /job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=//lastBuiltRevision
- rl=${STAGINGDIR}/logs/GIT_REVISION
- wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml..." --timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response
- sed -e "s#<lastBuiltRevision><SHA1>\([a-f0-9]\+\)</SHA1><branch><SHA1>\([a-f0-9]\+\)</SHA1><name>\([^<>]\+\)</name></branch></lastBuiltRevision>#\3\@\1#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
+wgetParams="--timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response"
+rl=${STAGINGDIR}/logs/REVISION
+if [[ $(find ${WORKSPACE} -mindepth 2 -maxdepth 3 -name ".svn") ]]; then
+ # Track git source revision through hudson api: /job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=//lastBuiltRevision
+ rl=${STAGINGDIR}/logs/GIT_REVISION
+ rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml..." ${wgetParams}
+ sed -e "s#<lastBuiltRevision><SHA1>\([a-f0-9]\+\)</SHA1><branch><SHA1>\([a-f0-9]\+\)</SHA1><name>\([^<>]\+\)</name></branch></lastBuiltRevision>#\3\@\1#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
+elif [[ $(find ${WORKSPACE} -mindepth 2 -maxdepth 3 -name ".svn") ]]; then
+ # Track svn source revision through hudson api: /job/${JOB_NAME}/api/xml?wrapper=changeSet&depth=1&xpath=//build[1]/changeSet/revision
+ rl=${STAGINGDIR}/logs/SVN_REVISION
+ rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/api/xml?wrapper=changeS..." ${wgetParams}
+ if [[ $? -eq 0 ]]; then
+ sed -e "s#<module>\(http[^<>]\+\)</module><revision>\([0-9]\+\)</revision>#\1\@\2\n#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
else
- echo "UNKNOWN" > ${rl}.txt
+ echo "UNKNOWN SVN REVISION(S)" > ${rl}.txt
fi
else
- sed -e "s#<module>\(http[^<>]\+\)</module><revision>\([0-9]\+\)</revision>#\1\@\2\n#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
+ # not git or svn... unsupported
+ echo "UNKNOWN REVISION(S)" > ${rl}.txt
fi
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
14 years, 10 months
JBoss Tools SVN: r32037 - trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-06-10 21:00:00 -0400 (Fri, 10 Jun 2011)
New Revision: 32037
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java
Log:
JBIDE-9110
https://issues.jboss.org/browse/JBIDE-9110
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java 2011-06-11 01:00:00 UTC (rev 32037)
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.cdi.seam.text.ext.test;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.jboss.tools.cdi.seam.config.core.test.SeamConfigTest;
+import org.jboss.tools.cdi.seam.text.ext.CDISeamExtPlugin;
+import org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigInjectedPointHyperlinkDetector;
+import org.jboss.tools.cdi.text.ext.test.HyperlinkDetectorTest;
+import org.jboss.tools.common.util.FileUtil;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SeamConfigInjectedPointHyperlinkTest extends SeamConfigTest {
+ public SeamConfigInjectedPointHyperlinkTest() {}
+
+ public void testSeamConfigInjectedPointHyperlink() throws Exception {
+ IHyperlink hyperlink = checkHyperLinkInJava(
+ "src/org/jboss/beans/injection/Injections.java",
+ project,
+ "@Inject", 1,
+ new SeamConfigInjectedPointHyperlinkDetector(),
+ "org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigInjectedPointHyperlink");
+ hyperlink.open();
+
+ IEditorPart editor = CDISeamExtPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ IFileEditorInput input = (IFileEditorInput)editor.getEditorInput();
+ IFile f = input.getFile();
+ assertEquals("seam-beans.xml", f.getName());
+
+ ITextSelection textSelection = getSelection(editor);
+
+ String text = FileUtil.readStream(f).substring(textSelection.getOffset(), textSelection.getOffset() + textSelection.getLength());
+ assertEquals("<test04:myType3>", text);
+
+ }
+
+ public static ITextSelection getSelection(IEditorPart editor) {
+ ITextEditor textEditor = (ITextEditor)editor.getAdapter(ITextEditor.class);
+ assertNotNull(textEditor);
+ ISelection s = textEditor.getSelectionProvider().getSelection();
+ assertTrue(s instanceof ITextSelection);
+ return (ITextSelection)s;
+ }
+
+ public static IHyperlink checkHyperLinkInJava(String fileName, IProject project, String substring, int innerOffset, AbstractHyperlinkDetector detector, String hyperlinkClassName) throws Exception {
+ IFile file = project.getFile(fileName);
+
+ assertNotNull("The file \"" + fileName + "\" is not found", file);
+ assertTrue("The file \"" + fileName + "\" is not found", file.isAccessible());
+
+ String text = FileUtil.readStream(file);
+ int offset = text.indexOf(substring);
+ assertTrue(offset > 0);
+ offset += innerOffset;
+
+ Region region = new Region(offset, 0);
+
+ FileEditorInput editorInput = new FileEditorInput(file);
+
+ IEditorPart part = HyperlinkDetectorTest.openFileInEditor(file);
+ CompilationUnitEditor editor = (CompilationUnitEditor)part;
+ ISourceViewer viewer = editor.getViewer();
+ detector.setContext(editor);
+
+ IHyperlink[] links = detector.detectHyperlinks(viewer, region, true);
+ if(links!=null) {
+ for (IHyperlink hyperlink : links) {
+ if(hyperlink.getClass().getName().equals(hyperlinkClassName)) {
+ return hyperlink;
+ }
+ }
+ }
+ fail("Can't find HyperLink");
+ return null;
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigInjectedPointHyperlinkTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r32036 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans: injection and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-06-10 20:58:33 -0400 (Fri, 10 Jun 2011)
New Revision: 32036
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/injection/
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/injection/Injections.java
Log:
JBIDE-9110
https://issues.jboss.org/browse/JBIDE-9110
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/injection/Injections.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/injection/Injections.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/injection/Injections.java 2011-06-11 00:58:33 UTC (rev 32036)
@@ -0,0 +1,14 @@
+package org.jboss.beans.injection;
+
+import javax.inject.Inject;
+
+import org.jboss.beans.test04.MyQualifier;
+import org.jboss.beans.test04.MyType3;
+
+public class Injections {
+
+ @Inject
+ @MyQualifier(kind="kind-04-3")
+ MyType3 b4;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/src/org/jboss/beans/injection/Injections.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r32035 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-06-10 20:56:28 -0400 (Fri, 10 Jun 2011)
New Revision: 32035
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/StaticAttribute.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/composite/CompositeComponent.java
Log:
https://issues.jboss.org/browse/JBIDE-9088
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-06-11 00:07:58 UTC (rev 32034)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-06-11 00:56:28 UTC (rev 32035)
@@ -126,7 +126,7 @@
IAttribute[] attributes = PageProcessor.getInstance().getAttributes(query, (IPageContext)context);
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
for(IAttribute attribute : attributes){
- if(!attribute.isExtended() && validateComponent(attribute.getComponent(), ((IPageContext)context).getNameSpaces(reg.getOffset()), query.getPrefix())){
+ if(!attribute.isExtended() && validateComponent(attribute.getComponent(), ((IPageContext)context).getNameSpaces(reg.getOffset()), query.getPrefix()) && attribute instanceof AbstractAttribute){
TLDAttributeHyperlink link = new TLDAttributeHyperlink((AbstractAttribute)attribute, reg);
link.setDocument(textViewer.getDocument());
hyperlinks.add(link);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java 2011-06-11 00:07:58 UTC (rev 32034)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java 2011-06-11 00:56:28 UTC (rev 32035)
@@ -124,7 +124,7 @@
protected void adopt(KbObject child) {
if(child.getKbProject() != null && child.getKbProject() != getKbProject()) return;
- ((KbObject)child).setParent(this);
+ child.setParent(this);
}
@@ -137,7 +137,7 @@
* @return list of changes
*/
public List<Change> merge(KbObject s) {
- KbObject o = (KbObject)s;
+ KbObject o = s;
source = o.source;
id = o.id;
resource = o.resource;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2011-06-11 00:07:58 UTC (rev 32034)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2011-06-11 00:56:28 UTC (rev 32035)
@@ -25,7 +25,6 @@
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
-import org.jboss.tools.jst.web.kb.PageProcessor;
import org.jboss.tools.jst.web.kb.internal.KbObject;
import org.jboss.tools.jst.web.kb.internal.KbXMLStoreConstants;
import org.jboss.tools.jst.web.kb.internal.taglib.composite.CompositeAttribute;
@@ -52,7 +51,7 @@
protected String description;
protected String name;
protected boolean hasExtendedAttributes = false;
- private Map<String, IAttribute> attributes = new HashMap<String, IAttribute>();
+ protected Map<String, IAttribute> attributes = new HashMap<String, IAttribute>();
private IAttribute[] attributesArray;
private Map<String, IAttribute> preferableAttributes = new HashMap<String, IAttribute>();
private IAttribute[] preferableAttributesArray;
@@ -347,7 +346,9 @@
* @param attribute
*/
public void addAttribute(IAttribute attribute) {
- adopt((KbObject)attribute);
+ if(attribute instanceof KbObject) {
+ adopt((KbObject)attribute);
+ }
attributes.put(attribute.getName(), attribute);
if(attribute.isExtended()) {
hasExtendedAttributes = true;
@@ -417,7 +418,9 @@
copy.requiredAttributes = new HashMap<String, IAttribute>();
IAttribute[] as = getAttributes();
for (IAttribute a: as) {
- copy.addAttribute(((AbstractAttribute)a).clone());
+ if(a instanceof AbstractAttribute) {
+ copy.addAttribute(((AbstractAttribute)a).clone());
+ }
if(a.isExtended()) {
copy.hasExtendedAttributes = true;
}
@@ -478,28 +481,36 @@
*/
public void mergeAttributes(AbstractComponent c, Change children) {
Map<Object,AbstractAttribute> attributeMap = new HashMap<Object, AbstractAttribute>();
- for (IAttribute a: getAttributes()) attributeMap.put(((KbObject)a).getId(), (AbstractAttribute)a);
+ for (IAttribute a: getAttributes()) {
+ if(a instanceof AbstractAttribute) {
+ attributeMap.put(((KbObject)a).getId(), (AbstractAttribute)a);
+ }
+ }
for (IAttribute a: c.getAttributes()) {
- AbstractAttribute loaded = (AbstractAttribute)a;
- AbstractAttribute current = attributeMap.remove(loaded.getId());
- if(current == null) {
- addAttribute(loaded);
- Change change = new Change(this, null, null, loaded);
- children.addChildren(Change.addChange(null, change));
- } else {
- removeAttribute(current);
- List<Change> rc = current.merge(loaded);
- if(rc != null) children.addChildren(rc);
- addAttribute(current);
+ if(a instanceof AbstractAttribute) {
+ AbstractAttribute loaded = (AbstractAttribute)a;
+ AbstractAttribute current = attributeMap.remove(loaded.getId());
+ if(current == null) {
+ addAttribute(loaded);
+ Change change = new Change(this, null, null, loaded);
+ children.addChildren(Change.addChange(null, change));
+ } else {
+ removeAttribute(current);
+ List<Change> rc = current.merge(loaded);
+ if(rc != null) children.addChildren(rc);
+ addAttribute(current);
+ }
}
}
for (IAttribute a: attributeMap.values()) {
- AbstractAttribute removed = (AbstractAttribute)a;
- if(attributes.get(removed.getName()) == removed) {
- attributes.remove(removed.getName());
- Change change = new Change(this, null, removed, null);
- children.addChildren(Change.addChange(null, change));
- clearAttributeArrays();
+ if(a instanceof AbstractAttribute) {
+ AbstractAttribute removed = (AbstractAttribute)a;
+ if(attributes.get(removed.getName()) == removed) {
+ attributes.remove(removed.getName());
+ Change change = new Change(this, null, removed, null);
+ children.addChildren(Change.addChange(null, change));
+ clearAttributeArrays();
+ }
}
}
}
@@ -526,7 +537,9 @@
}
for (IAttribute c: getAttributes()) {
- ((KbObject)c).toXML(element, context);
+ if(c instanceof KbObject) {
+ ((KbObject)c).toXML(element, context);
+ }
}
return element;
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/StaticAttribute.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/StaticAttribute.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/StaticAttribute.java 2011-06-11 00:56:28 UTC (rev 32035)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.jst.web.kb.internal.taglib;
+
+import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.kb.KbQuery;
+import org.jboss.tools.jst.web.kb.taglib.IAttribute;
+import org.jboss.tools.jst.web.kb.taglib.IComponent;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class StaticAttribute implements IAttribute {
+
+ protected String description;
+ protected String name;
+ protected boolean required;
+ protected IComponent component;
+
+ public StaticAttribute(IComponent component, String name) {
+ this.component = component;
+ this.name = name;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IProposalProcessor#getProposals(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.IPageContext)
+ */
+ public TextProposal[] getProposals(KbQuery query, IPageContext context) {
+ return EMPTY_PROPOSAL_LIST;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.taglib.IAttribute#getName()
+ */
+ public String getName() {
+ return name;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.taglib.IAttribute#getDescription()
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.taglib.IAttribute#isRequired()
+ */
+ public boolean isRequired() {
+ return required;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.taglib.IAttribute#isPreferable()
+ */
+ public boolean isPreferable() {
+ return isRequired();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.taglib.IAttribute#isExtended()
+ */
+ public boolean isExtended() {
+ return false;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.taglib.IAttribute#getComponent()
+ */
+ public IComponent getComponent() {
+ return component;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/StaticAttribute.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/composite/CompositeComponent.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/composite/CompositeComponent.java 2011-06-11 00:07:58 UTC (rev 32034)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/composite/CompositeComponent.java 2011-06-11 00:56:28 UTC (rev 32035)
@@ -12,9 +12,20 @@
import org.jboss.tools.jst.web.kb.internal.KbXMLStoreConstants;
import org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent;
+import org.jboss.tools.jst.web.kb.internal.taglib.StaticAttribute;
+import org.jboss.tools.jst.web.kb.taglib.IAttribute;
public class CompositeComponent extends AbstractComponent {
+ public static final String[] STATIC_ATTRIBUTES = new String[] {"id", "rendered"}; //$NON-NLS-1$ //$NON-NLS-2$
+
+ public CompositeComponent() {
+ for (String attribute : STATIC_ATTRIBUTES) {
+ IAttribute staticAttribute = new StaticAttribute(this, attribute);
+ attributes.put(attribute, staticAttribute);
+ }
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.KbObject#getXMLClass()
14 years, 10 months
JBoss Tools SVN: r32034 - trunk/jst/plugins/org.jboss.tools.jst.web.kb.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-06-10 20:07:58 -0400 (Fri, 10 Jun 2011)
New Revision: 32034
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-9098
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-06-10 23:28:18 UTC (rev 32033)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-06-11 00:07:58 UTC (rev 32034)
@@ -102,6 +102,7 @@
<contexttype id="FACELETS_PAGE_CONTEXT_TYPE">
<contenttype id="org.eclipse.wst.html.core.htmlsource" />
<contenttype id="jsf.facelet" />
+ <contenttype id="jsf.facelet.composite" />
</contexttype>
<contexttype id="XML_PAGE_CONTEXT_TYPE">
14 years, 10 months
JBoss Tools SVN: r32033 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: project and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-06-10 19:28:18 -0400 (Fri, 10 Jun 2011)
New Revision: 32033
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
Log:
JBIDE-9116
https://issues.jboss.org/browse/JBIDE-9116
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-06-10 22:53:38 UTC (rev 32032)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-06-10 23:28:18 UTC (rev 32033)
@@ -89,7 +89,7 @@
if(result) fire();
if(paths == null && result) return true;
- updateFileSystems(paths);
+ if(paths != null) updateFileSystems(paths);
fsVersion = pathsVersion;
return result;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2011-06-10 22:53:38 UTC (rev 32032)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2011-06-10 23:28:18 UTC (rev 32033)
@@ -220,7 +220,7 @@
static Map<IProject, Set<String>> checked = new HashMap<IProject, Set<String>>();
public static boolean checkModelNature(IProject project, String nature) {
- if(project == null || !project.isOpen()) {
+ if(project == null || !project.isOpen() || !project.isSynchronized(IResource.DEPTH_ONE)) {
if(project != null && checked.containsKey(project)) {
checked.remove(project);
}
@@ -239,10 +239,7 @@
ns.add(nature);
return true;
}
- if(!project.isSynchronized(1)) {
- return false;
- }
- ns.add(nature);
+// ns.add(nature);
return true;
}
14 years, 10 months