JBoss Tools SVN: r33123 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-21 18:25:52 -0400 (Thu, 21 Jul 2011)
New Revision: 33123
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java
Log:
JBIDE-9380
https://issues.jboss.org/browse/JBIDE-9380
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java 2011-07-21 21:52:54 UTC (rev 33122)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java 2011-07-21 22:25:52 UTC (rev 33123)
@@ -44,10 +44,7 @@
if(beansXML instanceof FileAnyImpl) {
FileAnyImpl f = (FileAnyImpl)beansXML;
if(f.getParent() instanceof FolderImpl) {
- long b = ((FolderImpl)f.getParent()).waitForUpdate();
- if(b > 0) {
- System.out.println("wait=" + b);
- }
+ ((FolderImpl)f.getParent()).waitForUpdate(); // I am not sure that we need it, but let this call be here for the sake of testing.
((FolderImpl)f.getParent()).update();
}
}
14 years, 5 months
JBoss Tools SVN: r33122 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 17:52:54 -0400 (Thu, 21 Jul 2011)
New Revision: 33122
Modified:
trunk/build/publish.sh
Log:
ensure staging.previous dirs exist
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-07-21 21:48:11 UTC (rev 33121)
+++ trunk/build/publish.sh 2011-07-21 21:52:54 UTC (rev 33122)
@@ -299,8 +299,8 @@
# TODO: JBIDE-8667 move current to previous; move next to current
# create folders if not already there (could be empty)
- echo -e "-mkdir ${JOB_NAME}" $DESTINATION/builds/staging.previous/
- echo -e "-mkdir ${JOB_NAME}.2" $DESTINATION/builds/staging.previous/
+ echo -e "mkdir ${JOB_NAME}" $DESTINATION/builds/staging.previous/
+ echo -e "mkdir ${JOB_NAME}.2" $DESTINATION/builds/staging.previous/
# purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
mkdir -p /tmp/${JOB_NAME}.2
14 years, 5 months
JBoss Tools SVN: r33121 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-21 17:48:11 -0400 (Thu, 21 Jul 2011)
New Revision: 33121
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemPeer.java
Log:
JBIDE-9380
https://issues.jboss.org/browse/JBIDE-9380
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemPeer.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemPeer.java 2011-07-21 21:45:25 UTC (rev 33120)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemPeer.java 2011-07-21 21:48:11 UTC (rev 33121)
@@ -17,7 +17,7 @@
import org.jboss.tools.common.model.filesystems.FilePathHelper;
public class FileSystemPeer {
- private Hashtable<String,Long> p = new Hashtable<String,Long>();
+ private Hashtable<String,Info> p = new Hashtable<String,Info>();
public FileSystemPeer() {}
@@ -26,7 +26,7 @@
}
public void register(File f) {
- p.put(toKey(f), toLastModified(f));
+ p.put(toKey(f), new Info(f));
}
public void unregister(File f) {
@@ -38,17 +38,16 @@
}
public boolean contains(File f) {
- return p.get(toKey(f)) != null;
+ return p.containsKey(toKey(f));
}
public boolean containsDir(File f) {
- return p.get(toKey(f, true)) != null;
+ return p.containsKey(toKey(f, true));
}
public boolean isUpdated(File f) {
- Object o = p.get(toKey(f));
- if(o == null) return f.exists();
- return f.lastModified() != ((Long)o).longValue();
+ Info o = p.get(toKey(f));
+ return (o == null) ? f.exists() : o.changed(f);
}
private String toKey(File f) {
@@ -61,8 +60,21 @@
return (asDir) ? s + XModelObjectConstants.SEPARATOR : s;
}
- private Long toLastModified(File f) {
- return !f.exists() ? Long.valueOf(0) : Long.valueOf(f.lastModified());
+ class Info {
+ long lastModified;
+ long length;
+ Info(File f) {
+ lastModified = !f.exists() ? 0 : f.lastModified();
+ length = f.isFile() && f.exists() ? f.length() : 0;
+ }
+
+ public boolean equals(Info other) {
+ return lastModified != other.lastModified || length != other.length;
+ }
+
+ public boolean changed(File f) {
+ return equals(new Info(f));
+ }
}
}
14 years, 5 months
JBoss Tools SVN: r33120 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 17:45:25 -0400 (Thu, 21 Jul 2011)
New Revision: 33120
Modified:
trunk/build/publish.sh
Log:
sftp commands need to pipe to sftp (oops)
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-07-21 21:43:18 UTC (rev 33119)
+++ trunk/build/publish.sh 2011-07-21 21:45:25 UTC (rev 33120)
@@ -305,17 +305,17 @@
# purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
mkdir -p /tmp/${JOB_NAME}.2
rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
- echo -e "rmdir ${JOB_NAME}.2" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
rmdir /tmp/${JOB_NAME}.2
# move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
- echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" $DESTINATION/builds/staging.previous/
+ echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
# move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}
- echo -e "rename ${JOB_NAME} ../staging.previous/${JOB_NAME}" $DESTINATION/builds/staging/
+ echo -e "rename ${JOB_NAME} ../staging.previous/${JOB_NAME}" | sftp $DESTINATION/builds/staging/
# move contents of /builds/staging/${JOB_NAME}.next into /builds/staging/${JOB_NAME}
- echo -e "rename ${JOB_NAME}.next ${JOB_NAME}" $DESTINATION/builds/staging/
+ echo -e "rename ${JOB_NAME}.next ${JOB_NAME}" | sftp $DESTINATION/builds/staging/
# generate 2 ${STAGINGDIR}/all/composite*.xml files which will point at:
# /builds/staging/${JOB_NAME}/all/repo/
14 years, 5 months
JBoss Tools SVN: r33119 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 17:43:18 -0400 (Thu, 21 Jul 2011)
New Revision: 33119
Modified:
trunk/build/publish.sh
Log:
push composite.*xml files into build's all/ folder
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-07-21 21:38:23 UTC (rev 33118)
+++ trunk/build/publish.sh 2011-07-21 21:43:18 UTC (rev 33119)
@@ -338,6 +338,7 @@
</repository>"
echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml
echo $metadata >> ${STAGINGDIR}/all/compositeArtifacts.xml
+ date; rsync -arzq ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/
fi
# extra publish step for aggregate update sites ONLY
14 years, 5 months
JBoss Tools SVN: r33118 - branches/jbosstools-3.2.x/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 17:38:23 -0400 (Thu, 21 Jul 2011)
New Revision: 33118
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
backport change in trunk to provide symlink 'latest/' build folder
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-07-21 21:14:28 UTC (rev 33117)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-07-21 21:38:23 UTC (rev 33118)
@@ -267,9 +267,11 @@
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ ${PUBLISHPATHSUFFIX} ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/
date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
14 years, 5 months
JBoss Tools SVN: r33117 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 17:14:28 -0400 (Thu, 21 Jul 2011)
New Revision: 33117
Modified:
trunk/build/publish.sh
Log:
fix dest path for .next folder
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-07-21 21:10:40 UTC (rev 33116)
+++ trunk/build/publish.sh 2011-07-21 21:14:28 UTC (rev 33117)
@@ -284,10 +284,10 @@
fi
# and create/replace a snapshot dir outside Hudson which is file:// accessible
- date; rsync -arzq --delete ${STAGINGDIR}/* $INTRNALDEST/builds/staging/${STAGINGDIR}.next
+ date; rsync -arzq --delete ${STAGINGDIR}/* $INTRNALDEST/builds/staging/${JOB_NAME}.next
# and create/replace a snapshot dir w/ static URL
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${STAGINGDIR}.next
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
# 1. To recursively purge contents of .../staging.previous/foobar/ folder:
# mkdir -p /tmp/foobar;
14 years, 5 months
JBoss Tools SVN: r33116 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 17:10:40 -0400 (Thu, 21 Jul 2011)
New Revision: 33116
Modified:
trunk/build/publish.sh
Log:
JBIDE-8667 generate 2 /all/composite*.xml files which will point at staging//all/repo/, staging.previous//all/repo/, staging.previous/.2/all/repo/
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-07-21 20:47:34 UTC (rev 33115)
+++ trunk/build/publish.sh 2011-07-21 21:10:40 UTC (rev 33116)
@@ -316,6 +316,28 @@
# move contents of /builds/staging/${JOB_NAME}.next into /builds/staging/${JOB_NAME}
echo -e "rename ${JOB_NAME}.next ${JOB_NAME}" $DESTINATION/builds/staging/
+
+ # generate 2 ${STAGINGDIR}/all/composite*.xml files which will point at:
+ # /builds/staging/${JOB_NAME}/all/repo/
+ # /builds/staging.previous/${JOB_NAME}/all/repo/
+ # /builds/staging.previous/${JOB_NAME}.2/all/repo/
+ now=$(date +%s000)
+ echo "<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging - ${JOB_NAME} Composite' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+" > ${STAGINGDIR}/all/compositeContent.xml
+ echo "<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging - ${JOB_NAME} Composite' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> " > ${STAGINGDIR}/all/compositeArtifacts.xml
+ metadata="<properties size='2'><property name='p2.compressed' value='true'/><property name='p2.timestamp' value='"${now}"'/></properties>
+<children size='3'>
+<child location='../../../staging/${JOB_NAME}/all/repo/'/>
+<child location='../../../staging.previous/${JOB_NAME}/all/repo/'/>
+<child location='../../../staging.previous/${JOB_NAME}.2/all/repo/'/>
+</children>
+</repository>"
+ echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml
+ echo $metadata >> ${STAGINGDIR}/all/compositeArtifacts.xml
fi
# extra publish step for aggregate update sites ONLY
14 years, 5 months
JBoss Tools SVN: r33115 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-21 16:47:34 -0400 (Thu, 21 Jul 2011)
New Revision: 33115
Modified:
trunk/build/publish.sh
Log:
JBIDE-8667 instead of just using rsync --delete to replace previous builds, use folder rotation scheme to avoid lengthy broken folders (incomplete updates)
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-07-21 20:24:29 UTC (rev 33114)
+++ trunk/build/publish.sh 2011-07-21 20:47:34 UTC (rev 33115)
@@ -284,10 +284,38 @@
fi
# and create/replace a snapshot dir outside Hudson which is file:// accessible
- date; rsync -arzq --delete ${STAGINGDIR} $INTRNALDEST/builds/staging/
+ date; rsync -arzq --delete ${STAGINGDIR}/* $INTRNALDEST/builds/staging/${STAGINGDIR}.next
# and create/replace a snapshot dir w/ static URL
- date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/staging/
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${STAGINGDIR}.next
+
+ # 1. To recursively purge contents of .../staging.previous/foobar/ folder:
+ # mkdir -p /tmp/foobar;
+ # rsync -aPrz --delete /tmp/foobar tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ # 2. To then remove entire .../staging.previous/foobar/ folder:
+ # echo -e "rmdir foobar" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ # rmdir /tmp/foobar
+
+ # TODO: JBIDE-8667 move current to previous; move next to current
+
+ # create folders if not already there (could be empty)
+ echo -e "-mkdir ${JOB_NAME}" $DESTINATION/builds/staging.previous/
+ echo -e "-mkdir ${JOB_NAME}.2" $DESTINATION/builds/staging.previous/
+
+ # purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
+ mkdir -p /tmp/${JOB_NAME}.2
+ rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
+ echo -e "rmdir ${JOB_NAME}.2" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ rmdir /tmp/${JOB_NAME}.2
+
+ # move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
+ echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" $DESTINATION/builds/staging.previous/
+
+ # move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}
+ echo -e "rename ${JOB_NAME} ../staging.previous/${JOB_NAME}" $DESTINATION/builds/staging/
+
+ # move contents of /builds/staging/${JOB_NAME}.next into /builds/staging/${JOB_NAME}
+ echo -e "rename ${JOB_NAME}.next ${JOB_NAME}" $DESTINATION/builds/staging/
fi
# extra publish step for aggregate update sites ONLY
14 years, 5 months
JBoss Tools SVN: r33114 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-21 16:24:29 -0400 (Thu, 21 Jul 2011)
New Revision: 33114
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml
Log:
updated to include EAP 5.1.1 -> JBDS-1784
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-07-21 20:13:45 UTC (rev 33113)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-07-21 20:24:29 UTC (rev 33114)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>0</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>6</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml 2011-07-21 20:13:45 UTC (rev 33113)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Component_Versions.xml 2011-07-21 20:24:29 UTC (rev 33114)
@@ -17,7 +17,7 @@
</listitem>
<listitem>
<para>
- JBoss Enterprise Application Platform 5.1
+ JBoss Enterprise Application Platform 5.1.1
</para>
</listitem>
</itemizedlist>
14 years, 5 months