October 2012 - jbosstools-commits

JBoss Tools SVN: r44199 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects: app3 and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-10-02 02:50:52 -0400 (Tue, 02 Oct 2012) New Revision: 44199 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.classpath trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.project trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/.jsdtscope trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.jdt.core.prefs trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.common.component trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/META-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/WEB-INF/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/WEB-INF/lib/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/WEB-INF/web.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/build/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java Log: new test project for ws bot tests Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.classpath =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.classpath ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.project =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.project ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/.jsdtscope =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/.jsdtscope ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.jdt.core.prefs 2012-10-02 06:50:52 UTC (rev 44199) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.common.component =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.common.component ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 06:50:52 UTC (rev 44199) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 06:50:52 UTC (rev 44199) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/META-INF/MANIFEST.MF 2012-10-02 06:50:52 UTC (rev 44199) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/WEB-INF/web.xml =================================================================== (Binary files differ) Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/App.java 2012-10-02 06:50:52 UTC (rev 44199) @@ -0,0 +1,18 @@ +package test; + +import java.util.HashSet; +import java.util.Set; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +public class App extends Application { + + @Override + public Set<Class<?>> getClasses() { + Set<Class<?>> classes = new HashSet<Class<?>>(); + classes.add(RestService.class); + return super.getClasses(); + } + +} Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/app3/src/test/RestService.java 2012-10-02 06:50:52 UTC (rev 44199) @@ -0,0 +1,14 @@ +package test; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; + +@Path("/rest") +public class RestService { + + @GET + public void method() { + + } + +}

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44198 - trunk/download.jboss.org/jbosstools/updates/juno/SR1.

by jbosstools-commits＠lists.jboss.org

Author: mickael_istria Date: 2012-10-02 02:40:37 -0400 (Tue, 02 Oct 2012) New Revision: 44198 Modified: trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeArtifacts.xml trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeContent.xml Log: JBDS-2341: Fix updates/juno/SR1 content to consume latest TP build. Modified: trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeArtifacts.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeArtifacts.xml 2012-10-02 01:28:12 UTC (rev 44197) +++ trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeArtifacts.xml 2012-10-02 06:40:37 UTC (rev 44198) @@ -5,34 +5,10 @@ <property name='p2.compressed' value='true'/> <property name='p2.timestamp' value='1348690298000'/> </properties> -<children size='12'> +<children size='1'>  -<child location='../../requirements/juno/201209280900-R/'/> -<child location='../../requirements/birt/4.2.1.v20120912/'/> -<child location='../../requirements/eclipse/R-4.2.1-201209141800/'/> -<child location='../../requirements/webtools/R-3.4.1-20120917174803/'/> - -<child location='../../requirements/m2eclipse/20120917-1234/'/> - +<child location='latest/'/> - -<child location='../../requirements/gwt/3.1.0.v201208080121-rel-r42/'/> -<child location='../../requirements/atlassian/3.0.6.v20120628/'/> - - -<child location='../../requirements/chrome-theme/1.5/'/> - - -<child location='../../requirements/swtbot/2.0.5/'/> -<child location='../../requirements/xulrunner-1.9.2/'/> - -<child location='../../requirements/orbit/R20120526062928/'/> - -<child location='../../requirements/orbit/R20100519200754/'/> - - - </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeContent.xml 2012-10-02 01:28:12 UTC (rev 44197) +++ trunk/download.jboss.org/jbosstools/updates/juno/SR1/compositeContent.xml 2012-10-02 06:40:37 UTC (rev 44198) @@ -5,34 +5,10 @@ <property name='p2.compressed' value='true'/> <property name='p2.timestamp' value='1348690298000'/> </properties> -<children size='12'> +<children size='1'>  -<child location='../../requirements/juno/201209280900-R/'/> -<child location='../../requirements/birt/4.2.1.v20120912/'/> -<child location='../../requirements/eclipse/R-4.2.1-201209141800/'/> -<child location='../../requirements/webtools/R-3.4.1-20120917174803/'/> - -<child location='../../requirements/m2eclipse/20120917-1234/'/> - +<child location='latest/'/> - -<child location='../../requirements/gwt/3.1.0.v201208080121-rel-r42/'/> -<child location='../../requirements/atlassian/3.0.6.v20120628/'/> - - -<child location='../../requirements/chrome-theme/1.5/'/> - - -<child location='../../requirements/swtbot/2.0.5/'/> -<child location='../../requirements/xulrunner-1.9.2/'/> - -<child location='../../requirements/orbit/R20120526062928/'/> - -<child location='../../requirements/orbit/R20100519200754/'/> - - - </children> </repository>

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44197 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.

by jbosstools-commits＠lists.jboss.org

Author: ldimaggio Date: 2012-10-01 21:28:12 -0400 (Mon, 01 Oct 2012) New Revision: 44197 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java Log: Added more logging to ExampleTest.java - seeing inconsistent results running on Mac with Jenkins log.info("Example name=" + getExampleName()); log.info("SWTJBTExt.isRunningOnMacOs() = " + SWTJBTExt.isRunningOnMacOs()); log.info("bot.shell(\"Java - Eclipse Platform\").isActive()" + bot.shell("Java - Eclipse Platform").isActive() ); log.info("configuredState.getServer().type" + configuredState.getServer().type); Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-01 21:13:41 UTC (rev 44196) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-02 01:28:12 UTC (rev 44197) @@ -92,6 +92,12 @@ // for (SWTBotShell s : theShells) { // System.out.println ("DEBUG! " + s.getText()); // } + + log.info("Example name=" + getExampleName()); + log.info("SWTJBTExt.isRunningOnMacOs() = " + SWTJBTExt.isRunningOnMacOs()); + log.info("bot.shell(\"Java - Eclipse Platform\").isActive()" + bot.shell("Java - Eclipse Platform").isActive() ); + log.info("configuredState.getServer().type" + configuredState.getServer().type); + if ( (SWTJBTExt.isRunningOnMacOs()) && (!bot.shell("Java - Eclipse Platform").isActive()) && (configuredState.getServer().type.equals("SOA")) ){ log.info("Running on a MAC - need to set Focus back to the Eclipse shell window"); bot.sleep(30000l);

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44196 - trunk/common/plugins/org.jboss.tools.common.ui.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-10-01 17:13:41 -0400 (Mon, 01 Oct 2012) New Revision: 44196 Modified: trunk/common/plugins/org.jboss.tools.common.ui/plugin.properties trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml Log: JBIDE-9443 https://issues.jboss.org/browse/JBIDE-9443 New Service Provider wizard, keywords are added. Modified: trunk/common/plugins/org.jboss.tools.common.ui/plugin.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/plugin.properties 2012-10-01 20:08:31 UTC (rev 44195) +++ trunk/common/plugins/org.jboss.tools.common.ui/plugin.properties 2012-10-01 21:13:41 UTC (rev 44196) @@ -4,3 +4,4 @@ command.newEditor.sidebyside.name=New Editor (Side by Side) command.newEditor.sidebyside.description=Open New Editor Side by Side to active Editor perspective.name=JBoss +preferenceNewServiceKeywords=java class Modified: trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml 2012-10-01 20:08:31 UTC (rev 44195) +++ trunk/common/plugins/org.jboss.tools.common.ui/plugin.xml 2012-10-01 21:13:41 UTC (rev 44196) @@ -52,6 +52,13 @@ </hover> </extension> + <extension + point="org.eclipse.ui.keywords"> + <keyword + label="%preferenceNewServiceKeywords" + id="org.jboss.tools.common.ui.newService"/> + </extension> + <extension point="org.eclipse.ui.newWizards"> <wizard category="org.eclipse.jdt.ui.java" @@ -63,9 +70,9 @@ <description> Create a Service Provider Type </description> -  + <keywordReference + id="org.jboss.tools.common.ui.newService"> + </keywordReference> </wizard> </extension>

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44195 - trunk/build/util/cleanup.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-01 16:08:31 -0400 (Mon, 01 Oct 2012) New Revision: 44195 Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh Log: use updates/integration/juno/soa-tooling/modeshape instead of just updates/integration/juno/soa-tooling when naming the sites Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh =================================================================== --- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 20:00:44 UTC (rev 44194) +++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 20:08:31 UTC (rev 44195) @@ -145,8 +145,9 @@ if [[ $getListSizeReturn -gt 0 ]]; then echo "Generate metadata for ${getListSizeReturn} subdir(s) in $sd/" | tee -a $log mkdir -p /tmp/cleanup-fresh-metadata/ - regenCompositeMetadata "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml" - regenCompositeMetadata "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml" + siteName=${sd##*/downloads_htdocs/tools/} + regenCompositeMetadata "$siteName" "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml" + regenCompositeMetadata "$siteName" "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml" rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/ rm -fr /tmp/cleanup-fresh-metadata/ else @@ -170,14 +171,15 @@ #regen metadata for remaining subdirs in this folder regenCompositeMetadata () { - subsubdirs=$1 - countChildren=$2 - fileType=$3 - fileName=$4 + siteName=$1 + subsubdirs=$2 + countChildren=$3 + fileType=$4 + fileName=$5 now=$(date +%s000) echo "<?xml version='1.0' encoding='UTF-8'?><?compositeArtifactRepository version='1.0.0'?> -<repository name='JBoss Tools Builds - ${type}' type='${fileType}' version='1.0.0'> +<repository name='JBoss Tools Builds - ${siteName}' type='${fileType}' version='1.0.0'> <properties size='2'><property name='p2.timestamp' value='${now}'/><property name='p2.compressed' value='true'/></properties> <children size='${countChildren}'>" > ${fileName} for ssd in $subsubdirs; do

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44194 - trunk/build/util/cleanup.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-01 16:00:44 -0400 (Mon, 01 Oct 2012) New Revision: 44194 Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh Log: exclude *.ml, *.html files when scanning sftp folders for child folders Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh =================================================================== --- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 19:43:47 UTC (rev 44193) +++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 20:00:44 UTC (rev 44194) @@ -63,7 +63,7 @@ dirs=$(sftp -b $tmp tools(a)filemgmt.jboss.org 2>/dev/null) i=0 for c in $dirs; do - if [[ $i -gt 2 ]] && [[ $c != "sftp>" ]] && [[ ${c##*.} != "" ]]; then # valid dir + if [[ $i -gt 2 ]] && [[ $c != "sftp>" ]] && [[ ${c##*.} != "" ]] && [[ ${c##*/*.*ml} != "" ]]; then # valid dir; exclude *.xml, *.html files getSubDirsReturn=$getSubDirsReturn" "$c fi (( i++ ))

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44193 - in trunk/build: util/cleanup and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-01 15:43:47 -0400 (Mon, 01 Oct 2012) New Revision: 44193 Modified: trunk/build/publish/publish.sh trunk/build/util/cleanup/jbosstools-cleanup.sh Log: parameterize /all/repo/ as childFolderSuffix; pass in from Jenkins and publish.sh script Modified: trunk/build/publish/publish.sh =================================================================== --- trunk/build/publish/publish.sh 2012-10-01 19:29:05 UTC (rev 44192) +++ trunk/build/publish/publish.sh 2012-10-01 19:43:47 UTC (rev 44193) @@ -482,7 +482,7 @@ # regenerate http://download.jboss.org/jbosstools/builds/nightly/*/*/composite*.xml files for up to 5 builds, cleaning anything older than 5 days old wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate chmod +x jbosstools-cleanup.sh - ./jbosstools-cleanup.sh --keep 5 --age-to-delete 5 + ./jbosstools-cleanup.sh --keep 5 --age-to-delete 5 --childFolderSuffix /all/repo/ rm -f jbosstools-cleanup.sh fi Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh =================================================================== --- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 19:29:05 UTC (rev 44192) +++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 19:43:47 UTC (rev 44193) @@ -10,10 +10,12 @@ echo "Logfile: $log" | tee -a $log echo "" | tee -a $log -#commandline options so we can call this by itself using -# `jbosstools-cleanup.sh -k 1 -a 2` -# or call it from within publish.sh using -# `jbosstools-cleanup.sh -k 5 -a 5` +# commandline options so we can call it from jbosstools-cleanup Jenkins job using +# `jbosstools-cleanup.sh -k 1 -a 2 -S /all/repo/` +# or call it from within publish.sh using +# `jbosstools-cleanup.sh -k 5 -a 5 -S /all/repo/` +# or call it from within promote.sh using +# `jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}" --regen-metadata-only` #defauls numbuildstokeep=1000 # keep X builds per branch @@ -21,12 +23,13 @@ dirsToScan="builds/nightly/core builds/nightly/coretests builds/nightly/soa-tooling builds/nightly/soatests builds/nightly/webtools" delete=1 # if 1, files will be deleted. if 0, files will be listed for delete but not actually removed checkTimeStamps=1 # if 1, check for timestamped folders, eg., 2012-09-30_04-01-36-H5622 and deduce the age from name. if 0, skip name-to-age parsing and delete nothing +childFolderSuffix="/" # for component update sites, set to "/"; for aggregate builds (not update sites) use "/all/repo/" if [[ $# -lt 1 ]]; then - echo "Usage: $0 [-k num-builds-to-keep] [-a num-days-at-which-to-delete] [-d dirs-to-scan]" - echo "Example (Jenkins): $0 -k 1 -a 2" - echo "Example (publish.sh): $0 -k 5 -a 5" - echo "Example: $0 -d 'updates/development/indigo/soa-tooling/modeshape/' --regen-metadata-only" + echo "Usage: $0 [-k num-builds-to-keep] [-a num-days-at-which-to-delete] [-d dirs-to-scan] [--regen-metadata-only] [--childFolderSuffix /all/repo/]" + echo "Example (Jenkins job): $0 --keep 1 --age-to-delete 2 --childFolderSuffix /all/repo/" + echo "Example (publish.sh): $0 -k 5 -a 5 -S /all/repo/" + echo "Example (promote.sh): $0 --dirs-to-scan 'updates/integration/indigo/soa-tooling/' --regen-metadata-only" exit 1; fi @@ -37,6 +40,7 @@ '-a'|'--age-to-delete') threshholdwhendelete="$2"; shift 1;; '-d'|'--dirs-to-scan') dirsToScan="$2"; shift 1;; '-M'|'--regen-metadata-only') delete=0; checkTimeStamps=0; shift 0;; + '-S'|'--childFolderSuffix') childFolderSuffix="$2" esac shift 1 done @@ -177,7 +181,7 @@ <properties size='2'><property name='p2.timestamp' value='${now}'/><property name='p2.compressed' value='true'/></properties> <children size='${countChildren}'>" > ${fileName} for ssd in $subsubdirs; do - echo "<child location='${ssd}/all/repo/'/>" >> ${fileName} + echo "<child location='${ssd}${childFolderSuffix}'/>" >> ${fileName} done echo "</children> </repository>

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44192 - trunk/build/util/cleanup.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-01 15:29:05 -0400 (Mon, 01 Oct 2012) New Revision: 44192 Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh Log: add check for checkTimeStamps = 1 Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh =================================================================== --- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 19:28:58 UTC (rev 44191) +++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 19:29:05 UTC (rev 44192) @@ -20,6 +20,7 @@ threshholdwhendelete=365 # purge builds more than X days old dirsToScan="builds/nightly/core builds/nightly/coretests builds/nightly/soa-tooling builds/nightly/soatests builds/nightly/webtools" delete=1 # if 1, files will be deleted. if 0, files will be listed for delete but not actually removed +checkTimeStamps=1 # if 1, check for timestamped folders, eg., 2012-09-30_04-01-36-H5622 and deduce the age from name. if 0, skip name-to-age parsing and delete nothing if [[ $# -lt 1 ]]; then echo "Usage: $0 [-k num-builds-to-keep] [-a num-days-at-which-to-delete] [-d dirs-to-scan]" @@ -35,7 +36,7 @@ '-k'|'--keep') numbuildstokeep="$2"; shift 1;; '-a'|'--age-to-delete') threshholdwhendelete="$2"; shift 1;; '-d'|'--dirs-to-scan') dirsToScan="$2"; shift 1;; - '-M'|'--regen-metadata-only') delete=0; shift 0;; + '-M'|'--regen-metadata-only') delete=0; checkTimeStamps=0; shift 0;; esac shift 1 done @@ -82,43 +83,45 @@ #echo $subsubdirs tmp=`mktemp` for ssd in $subsubdirs; do - if [[ ${ssd##$sd/201*} == "" ]]; then # a build dir + if [[ ${ssd##$sd/201*} == "" ]] || [[ $checkTimeStamps -eq 0 ]]; then # a build dir buildid=${ssd##*/}; echo $buildid >> $tmp fi done - newest=$(cat $tmp | sort -r | head -$numkeep) # keep these - all=$(cat $tmp | sort -r) # check these - rm -f $tmp - for dd in $all; do - keep=0; - # sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT - sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-H(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT - (( day = now - sec )) - (( day = day / 3600 / 24 )) - for n in $newest; do - if [[ $dd == $n ]] || [[ $day -le $threshhold ]]; then - keep=1 - fi - done - if [[ $keep -eq 0 ]]; then - echo -n "- $sd/$dd (${day}d)... " | tee -a $log - if [[ $delete -eq 1 ]]; then - if [[ $USER == "hudson" ]]; then - # can't delete the dir, but can at least purge its contents - rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null - rsync --rsh=ssh --protocol=28 -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log - echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/ - popd >/dev/null; rm -fr /tmp/$dd + if [[ $checkTimeStamps -eq 1 ]]; then + newest=$(cat $tmp | sort -r | head -$numkeep) # keep these + all=$(cat $tmp | sort -r) # check these + rm -f $tmp + for dd in $all; do + keep=0; + # sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT + sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-H(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT + (( day = now - sec )) + (( day = day / 3600 / 24 )) + for n in $newest; do + if [[ $dd == $n ]] || [[ $day -le $threshhold ]]; then + keep=1 fi - echo "" | tee -a $log + done + if [[ $keep -eq 0 ]]; then + echo -n "- $sd/$dd (${day}d)... " | tee -a $log + if [[ $delete -eq 1 ]]; then + if [[ $USER == "hudson" ]]; then + # can't delete the dir, but can at least purge its contents + rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null + rsync --rsh=ssh --protocol=28 -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log + echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/ + popd >/dev/null; rm -fr /tmp/$dd + fi + echo "" | tee -a $log + else + echo " SKIPPED." + fi else - echo " SKIPPED." + echo "+ $sd/$dd (${day}d)" | tee -a $log fi - else - echo "+ $sd/$dd (${day}d)" | tee -a $log - fi - done + done + fi # generate metadata in the nightly/core/trunk/ folder to composite the remaining sites into one getSubDirs $sd 1; #return #getSubDirsReturn @@ -126,7 +129,7 @@ #echo $subsubdirs tmp=`mktemp` for ssd in $subsubdirs; do - if [[ ${ssd##$sd/201*} == "" ]]; then # a build dir + if [[ ${ssd##$sd/201*} == "" ]] || [[ $checkTimeStamps -eq 0 ]]; then # a build dir buildid=${ssd##*/}; echo $buildid >> $tmp fi

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44191 - trunk/build/publish.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-01 15:28:58 -0400 (Mon, 01 Oct 2012) New Revision: 44191 Modified: trunk/build/publish/promote.sh Log: remove trailing slash Modified: trunk/build/publish/promote.sh =================================================================== --- trunk/build/publish/promote.sh 2012-10-01 19:12:18 UTC (rev 44190) +++ trunk/build/publish/promote.sh 2012-10-01 19:28:58 UTC (rev 44191) @@ -46,5 +46,5 @@ # JBIDE-12662: regenerate composite metadata in updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME} folder for all children wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate chmod +x jbosstools-cleanup.sh -./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/" --regen-metadata-only +./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}" --regen-metadata-only rm -f jbosstools-cleanup.sh

12 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r44190 - trunk/build/publish.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-01 15:12:18 -0400 (Mon, 01 Oct 2012) New Revision: 44190 Modified: trunk/build/publish/promote.sh Log: work one folder up, in PARENT_FOLDER instead of PARENT_FOLDER/PROJECT_NAME Modified: trunk/build/publish/promote.sh =================================================================== --- trunk/build/publish/promote.sh 2012-10-01 19:09:51 UTC (rev 44189) +++ trunk/build/publish/promote.sh 2012-10-01 19:12:18 UTC (rev 44190) @@ -46,5 +46,5 @@ # JBIDE-12662: regenerate composite metadata in updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME} folder for all children wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate chmod +x jbosstools-cleanup.sh -./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}" --regen-metadata-only +./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/" --regen-metadata-only rm -f jbosstools-cleanup.sh

12 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2012