JBoss Tools SVN: r30114 - trunk/build/hudson-jobs.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-29 13:13:10 -0400 (Tue, 29 Mar 2011)
New Revision: 30114
Modified:
trunk/build/hudson-jobs/pom-sync.xml
Log:
update pom-sync.xml w/ new examples and safer OOTB defaults
Modified: trunk/build/hudson-jobs/pom-sync.xml
===================================================================
--- trunk/build/hudson-jobs/pom-sync.xml 2011-03-29 17:12:57 UTC (rev 30113)
+++ trunk/build/hudson-jobs/pom-sync.xml 2011-03-29 17:13:10 UTC (rev 30114)
@@ -58,15 +58,17 @@
<viewFilter>view/DevStudio_Trunk/</viewFilter>
<!-- default .* to select all -->
- <regexFilter>.*</regexFilter>
+ <!-- <regexFilter>.*</regexFilter> -->
+ <!-- <regexFilter>.*TEMPLATE.*</regexFilter> -->
+ <regexFilter>MyJobNameHere</regexFilter>
<!-- if there's an existing config.xml (not config.$timestamp.xml) then overwrite it if true -->
- <overwriteExistingConfigXMLFile>true</overwriteExistingConfigXMLFile>
+ <overwriteExistingConfigXMLFile>false</overwriteExistingConfigXMLFile>
<!-- either "pull" updated job config.xml file(s) from the server (default, reads only & stores a copy locally), or
"push" updates from local to the server (replacing existing job config.xml on server :: CAUTION!)
-->
- <operation>push</operation>
+ <operation>pull</operation>
</configuration>
</plugin>
13 years
JBoss Tools SVN: r30111 - tags.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-29 12:43:28 -0400 (Tue, 29 Mar 2011)
New Revision: 30111
Added:
tags/jbosstools-3.2.0.Final/
Log:
Tagged from jbosstools-3.2_stable_branch.aggregate #329, rev 29160
13 years
JBoss Tools SVN: r30110 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-03-29 12:42:35 -0400 (Tue, 29 Mar 2011)
New Revision: 30110
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeleteCloudHandler.java
Log:
[JBIDE-8290] delete is now only available on cloud items in the cloud viewer
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-29 15:59:19 UTC (rev 30109)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-03-29 16:42:35 UTC (rev 30110)
@@ -1,3 +1,11 @@
+2011-03-29 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * plugin.xml:
+ * src/org/jboss/tools/deltacloud/ui/commands/DeleteCloudHandler.java
+ (getSelectedClouds):
+ (getFirstSelectedCloud):
+ [JBIDE-8290] delete is now only available on cloud items in the cloud viewer
+
2011-03-25 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/deltacloud/ui/views/cloudelements/TableViewerColumnComparator.java
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-03-29 15:59:19 UTC (rev 30109)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-03-29 16:42:35 UTC (rev 30110)
@@ -142,9 +142,8 @@
variable="selection">
<and>
<count value="+" />
- <iterate operator="and">
- <adapt
- type="org.jboss.tools.deltacloud.core.DeltaCloud" />
+ <iterate operator="or">
+ <instanceof value="org.jboss.tools.deltacloud.ui.views.cloud.CloudItem" />
</iterate>
</and>
</with>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeleteCloudHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeleteCloudHandler.java 2011-03-29 15:59:19 UTC (rev 30109)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeleteCloudHandler.java 2011-03-29 16:42:35 UTC (rev 30110)
@@ -38,7 +38,7 @@
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
-import org.jboss.tools.internal.deltacloud.ui.utils.WorkbenchUtils;
+import org.jboss.tools.deltacloud.ui.views.cloud.CloudItem;
/**
* @author Andre Dietisheim
@@ -138,7 +138,9 @@
DeltaCloud deltaCloud = null;
if (selectedElements.size() > 0) {
Object object = selectedElements.get(0);
- deltaCloud = WorkbenchUtils.adapt(object, DeltaCloud.class);
+ if (object instanceof CloudItem) {
+ deltaCloud = ((CloudItem) object).getModel();
+ }
}
return deltaCloud;
}
@@ -146,9 +148,8 @@
private Collection<DeltaCloud> getSelectedClouds(List<?> selectedElements) {
Set<DeltaCloud> selectedClouds = new HashSet<DeltaCloud>();
for (Object element : selectedElements) {
- DeltaCloud deltaCloud = WorkbenchUtils.adapt(element, DeltaCloud.class);
- if (deltaCloud != null) {
- selectedClouds.add(deltaCloud);
+ if (element instanceof CloudItem) {
+ selectedClouds.add(((CloudItem) element).getModel());
}
}
return selectedClouds;
13 years
JBoss Tools SVN: r30109 - in trunk/build/hudson-jobs: cache and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-29 11:59:19 -0400 (Tue, 29 Mar 2011)
New Revision: 30109
Added:
trunk/build/hudson-jobs/cache/
trunk/build/hudson-jobs/cache/https/
trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/
trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/
trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/
trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt...
trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt...
trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt...
trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt...
trunk/build/hudson-jobs/pom-sync.xml
Log:
new sync tool - pom-sync.xml + sample config.xml
Added: trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt...
===================================================================
--- trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... (rev 0)
+++ trunk/build/hudson-jobs/cache/https/hudson.qa.jboss.com/hudson/view/DevSt... 2011-03-29 15:59:19 UTC (rev 30109)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <actions/>
+ <description>Nightly build using Tycho, monitoring SVN every 6 hrs for changes.
+
+<h2><a style="color:#FF9933" href="http://download.jboss.org/jbosstools/builds/cascade/trunk.html">Build Job Cascade &amp; Results</a></h2>
+</description>
+ <logRotator>
+ <daysToKeep>5</daysToKeep>
+ <numToKeep>5</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>MAVEN_FLAGS</name>
+ <description>Pass in lifecycle phase and extra flags to Maven, such as:
+<pre>
+clean :: clean before building *
+integration-test :: build and test *
+install :: build, test, and install into m2 repo *
+osgi-test:test :: just (re-)run test(s)
+
+-P hudson :: enable hudson build ID in feature/plugin qualifiers
+
+-Dmaven.test.skip :: skip compiling and running tests
+
+-Dmaven.repo.local=${WORKSPACE}/m2-repository :: path to local m2 repo
+
+-fae :: fail at end
+-fn :: fail never
+
+-o :: offline
+-B :: batch (non-interactive) mode
+-U :: check for updates
+-e :: if error occurs, dump stack into console
+
+-q :: quieter output</pre>
+</description>
+ <defaultValue>clean install -B -U -fae -e -Dmaven.repo.local=${WORKSPACE}/m2-repository -P hudson</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.disk__usage.DiskUsageProperty/>
+ <hudson.plugins.jira.JiraProjectProperty>
+ <siteName>http://opensource.atlassian.com/projects/hibernate/</siteName>
+ </hudson.plugins.jira.JiraProjectProperty>
+ </properties>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>http://anonsvn.jboss.org/repos/jbosstools/trunk/FIXME</remote>
+ <local>sources</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>http://anonsvn.jboss.org/repos/jbosstools/trunk/build</remote>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <doRevert>false</doRevert>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossTools/</url>
+ <rootModule/>
+ </browser>
+ <excludedRegions/>
+ <includedRegions/>
+ <excludedUsers/>
+ <excludedRevprop/>
+ <excludedCommitMessages/>
+ </scm>
+ <assignedNode>RHEL_any</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>true</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>java16_default</jdk>
+ <triggers class="vector">
+ <hudson.triggers.SCMTrigger>
+ <spec>20 3,9,15,21 * * * </spec>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
+ <concurrentBuild>false</concurrentBuild>
+ <builders>
+ <hudson.tasks.Maven>
+ <targets>${MAVEN_FLAGS}</targets>
+ <mavenName>maven-3.0.1</mavenName>
+ <jvmOptions>-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m</jvmOptions>
+ <pom>${WORKSPACE}/build/parent/pom.xml</pom>
+ <usePrivateRepository>false</usePrivateRepository>
+ </hudson.tasks.Maven>
+ <hudson.tasks.Maven>
+ <targets>${MAVEN_FLAGS} -DJOB_NAME=${JOB_NAME} -DBUILD_ID=${BUILD_ID} -DBUILD_NUMBER=${BUILD_NUMBER}</targets>
+ <mavenName>maven-3.0.1</mavenName>
+ <jvmOptions>-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m</jvmOptions>
+ <pom>${WORKSPACE}/sources/pom.xml</pom>
+ <usePrivateRepository>true</usePrivateRepository>
+ </hudson.tasks.Maven>
+ <hudson.tasks.Shell>
+ <command># script here: http://anonsvn.jboss.org/repos/jbosstools/trunk/build/publish.sh
+. ${WORKSPACE}/build/publish.sh</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers>
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>**/TEST-*.xml</testResults>
+ <keepLongStdio>false</keepLongStdio>
+ <testDataPublishers/>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.ArtifactArchiver>
+ <artifacts>**/*Update*.zip</artifacts>
+ <excludes>**/target/**</excludes>
+ <latestOnly>true</latestOnly>
+ <zip>false</zip>
+ </hudson.tasks.ArtifactArchiver>
+ <hudson.plugins.textfinder.TextFinderPublisher>
+ <fileSet>results/*/logs/ERRORLOG.txt,results/*/logs/FAIL_LOG.txt</fileSet>
+ <regexp>ERROR|AILURE</regexp>
+ <succeedIfFound>false</succeedIfFound>
+ <unstableIfFound>true</unstableIfFound>
+ <alsoCheckConsoleOutput>false</alsoCheckConsoleOutput>
+ </hudson.plugins.textfinder.TextFinderPublisher>
+ <hudson.tasks.Mailer>
+ <recipients/>
+ <notifyEveryBuild>false</notifyEveryBuild>
+ <dontNotifyOnModules>false</dontNotifyOnModules>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ <hudson.plugins.emotional__hudson.EmotionalHudsonPublisher/>
+ </publishers>
+ <buildWrappers>
+ <hudson.plugins.build__timeout.BuildTimeoutWrapper>
+ <timeoutMinutes>120</timeoutMinutes>
+ <failBuild>false</failBuild>
+ </hudson.plugins.build__timeout.BuildTimeoutWrapper>
+ <hudson.plugins.xvnc.Xvnc>
+ <takeScreenshot>false</takeScreenshot>
+ </hudson.plugins.xvnc.Xvnc>
+ </buildWrappers>
+</project>
Added: trunk/build/hudson-jobs/pom-sync.xml
===================================================================
--- trunk/build/hudson-jobs/pom-sync.xml (rev 0)
+++ trunk/build/hudson-jobs/pom-sync.xml 2011-03-29 15:59:19 UTC (rev 30109)
@@ -0,0 +1,76 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.hudson.jobs.all</artifactId>
+ <name>org.jboss.tools.hudson.jobs.all</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugin</groupId>
+ <artifactId>hudson-job-sync-plugin</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+<!--
+To be able to connect to server, must first import certificate or you may get this error:
+
+ javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException: unable to find valid certification path to requested target
+
+AS USER (with Firefox):
+
+Browse to https://hudson.qa.jboss.com/hudson & accept the cert.
+
+ Edit > Preferences > Advanced > Encryption > View Certificates > find hudson cert > Export to file /tmp/hudson.qa.jboss.com.cert
+
+AS ROOT (default password is "changeit"):
+
+ # /opt/sun-java2-6.0/jre/bin/keytool -list -keystore /opt/sun-java2-6.0/jre/lib/security/cacerts | grep hudson
+ # /opt/sun-java2-6.0/jre/bin/keytool -import -alias hudson.qa -keystore /opt/sun-java2-6.0/jre/lib/security/cacerts -file /tmp/hudson.qa.jboss.com.cert
+ # /opt/sun-java2-6.0/jre/bin/keytool -list -keystore /opt/sun-java2-6.0/jre/lib/security/cacerts | grep hudson
+
+To run, make sure that JAVA_HOME is set to the path where you imported the cert, eg.:
+
+ $ export JAVA_HOME=/opt/sun-java2-6.0/; mvn clean install
+-->
+
+ <!-- more output w/ verbose; default false -->
+ <verbose>false</verbose>
+
+ <!-- server and connection details -->
+ <!-- <hudsonURL>https://hudson.qa.jboss.com/hudson/</hudsonURL> -->
+ <hudsonURL>http://localhost:8080/</hudsonURL>
+ <username>SET USERNAME HERE</username>
+ <password>SET PASSWORD HERE</password>
+
+ <!-- to select a subset of jobs, use these filters; default none (all jobs on server!) -->
+ <!-- <viewFilter>view/DevStudio_Stable_Branch/</viewFilter> -->
+ <viewFilter>view/DevStudio_Trunk/</viewFilter>
+
+ <!-- default .* to select all -->
+ <regexFilter>.*</regexFilter>
+
+ <!-- if there's an existing config.xml (not config.$timestamp.xml) then overwrite it if true -->
+ <overwriteExistingConfigXMLFile>true</overwriteExistingConfigXMLFile>
+
+ <!-- either "pull" updated job config.xml file(s) from the server (default, reads only & stores a copy locally), or
+ "push" updates from local to the server (replacing existing job config.xml on server :: CAUTION!)
+ -->
+ <operation>push</operation>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
13 years
JBoss Tools SVN: r30108 - trunk/build/hudson-jobs.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-29 11:58:36 -0400 (Tue, 29 Mar 2011)
New Revision: 30108
Added:
trunk/build/hudson-jobs/pom.xml
Log:
add no-nothing pom as pseudo-readme and base for importing this folder as a maven project into Eclipse
Added: trunk/build/hudson-jobs/pom.xml
===================================================================
--- trunk/build/hudson-jobs/pom.xml (rev 0)
+++ trunk/build/hudson-jobs/pom.xml 2011-03-29 15:58:36 UTC (rev 30108)
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>hudson-jobs</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <!-- This is a no-op pom.
+
+ See:
+
+ * pom-checker*.xml - retrieves information from Hudson
+ * pom-publisher.xml - pushes new jobs to Hudson based on config.xml template
+
+ * pom-sync*.xml - creates a local cache of job config.xml files or pushes local changes to server.
+
+ -->
+</project>
\ No newline at end of file
13 years
JBoss Tools SVN: r30107 - trunk/build/hudson-jobs.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-03-29 11:58:12 -0400 (Tue, 29 Mar 2011)
New Revision: 30107
Modified:
trunk/build/hudson-jobs/.gitignore
Log:
.gitignore file
Modified: trunk/build/hudson-jobs/.gitignore
===================================================================
--- trunk/build/hudson-jobs/.gitignore 2011-03-29 15:54:31 UTC (rev 30106)
+++ trunk/build/hudson-jobs/.gitignore 2011-03-29 15:58:12 UTC (rev 30107)
@@ -1,2 +1,2 @@
-pom-publisher-internal.xml
-pom-checker-internal.xml
+*-internal.xml
+.settings
13 years
JBoss Tools SVN: r30106 - in trunk/forge/plugins/org.jboss.tools.seam.forge: src/org/jboss/tools/seam/forge/importer and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-03-29 11:54:31 -0400 (Tue, 29 Mar 2011)
New Revision: 30106
Modified:
trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
Log:
move to eclipse 3.7M6
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF 2011-03-29 15:20:53 UTC (rev 30105)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/META-INF/MANIFEST.MF 2011-03-29 15:54:31 UTC (rev 30106)
@@ -11,8 +11,8 @@
org.eclipse.jdt.launching,
org.eclipse.ui.editors,
org.eclipse.ui.ide,
- org.maven.ide.eclipse,
- org.maven.ide.eclipse.maven_embedder
+ org.eclipse.m2e.core;bundle-version="0.13.0",
+ org.eclipse.m2e.maven.runtime;bundle-version="0.13.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.jboss.tools.seam.forge.ForgePlugin
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-03-29 15:20:53 UTC (rev 30105)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-03-29 15:54:31 UTC (rev 30106)
@@ -11,10 +11,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.maven.ide.eclipse.MavenPlugin;
-import org.maven.ide.eclipse.core.IMavenConstants;
-import org.maven.ide.eclipse.project.MavenProjectInfo;
-import org.maven.ide.eclipse.project.ProjectImportConfiguration;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.core.IMavenConstants;
+import org.eclipse.m2e.core.project.MavenProjectInfo;
+import org.eclipse.m2e.core.project.ProjectImportConfiguration;
public class ProjectImporter {
13 years
JBoss Tools SVN: r30105 - trunk/tests/plugins/org.jboss.tools.tests.performance/scripts.
by jbosstools-commits@lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-03-29 11:20:53 -0400 (Tue, 29 Mar 2011)
New Revision: 30105
Modified:
trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml
Log:
performance script: do not download JBT zip when it won't be installed anyway
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-29 14:59:19 UTC (rev 30104)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-29 15:20:53 UTC (rev 30105)
@@ -108,8 +108,18 @@
<get-and-checksum pattern="{0} *{1}" dir="${libdir}" md5="${md5.eclipse.platform}" dst="${zip.eclipse.platform}" src="${get.zip.eclipse.platform}" />
<get-and-checksum pattern="{0} *{1}" dir="${libdir}" md5="${md5.eclipse.automated}" dst="${zip.eclipse.automated}" src="${get.zip.eclipse.automated}" />
<get-and-checksum pattern="{0} {1}" dir="${libdir}" md5="${md5.eclipse.j2ee}" dst="${zip.eclipse.j2ee}" src="${get.zip.eclipse.j2ee}" />
+ <groovy>
+ if (properties['jbt.install.tools']=='true') {
+ ant.get(
+ dest:properties['libdir']+'/'+properties['zip.jboss.tools'],
+ skipexisting:properties['zip.jboss.tools.skipexisting'],
+ src:properties['get.zip.jboss.tools']
+ )
+ }
+ </groovy>
+ <!--
<get dest="${libdir}/${zip.jboss.tools}" skipexisting="${zip.jboss.tools.skipexisting}" src="${get.zip.jboss.tools}"/>
- <!--
+
<get-and-checksum pattern="MD5 ({1}) = {0}" dir="${libdir}" md5="${md5.derby.plugin}" dst="${zip.derby.plugin}" src="${get.zip.derby.plugin}"/>
<move file="${libdir}/${zip.derby.plugin}" tofile="${libdir}/org.apache.derby_1.0.0.zip" />
-->
13 years
JBoss Tools SVN: r30104 - trunk/tests/plugins/org.jboss.tools.tests.performance/scripts.
by jbosstools-commits@lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-03-29 10:59:19 -0400 (Tue, 29 Mar 2011)
New Revision: 30104
Modified:
trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml
trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties
trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml
Log:
performance tests: support more dimensions to measure, able to execute on bundle with or without JBT
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-29 14:33:13 UTC (rev 30103)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-29 14:59:19 UTC (rev 30104)
@@ -52,7 +52,7 @@
<target name="get-dependencies">
<groovy>
properties['zip.jboss.tools.skipexisting']=true
- if (!properties['get.zip.jboss.tools']) {
+ if (!properties['get.zip.jboss.tools'] && properties['jbt.install.tools']=='true') {
println 'Update-site zip not defined, determining default (nightly trunk)'
link = 'http://download.jboss.org/jbosstools/builds/nightly/trunk/latestBuild.html'
ant.get(dest:properties['tmpdir'],src:link)
@@ -124,55 +124,75 @@
<sequential>
<groovy>
-
- println 'Unzipping update site'
- ant.mkdir(dir:properties['tmpdir']+'/upd-site')
- ant.unzip(
+ import java.text.SimpleDateFormat;
+ def df_date = new SimpleDateFormat('yyyyMMddHHmm')
+ def install= properties['jbt.install.tools'] == 'true'
+ if (install) {
+ // unzip JBossTools updatesite and determine buildID and build date
+ println 'Unzipping update site'
+ ant.mkdir(dir:properties['tmpdir']+'/upd-site')
+ ant.unzip(
src:properties['libdir']+'/'+properties['zip.jboss.tools'],
dest:properties['tmpdir']+'/upd-site'
- )
- println 'Searching for features and detecting version'
- def version = ""
- def features = ""
- def featuresDir = new File(properties['tmpdir']+'/upd-site/features')
- if (!featuresDir.isDirectory() || !featuresDir.exists()) {
- ant.fail(message:'Update site unzip error, '+properties['tmpdir']+'/upd-site/features does not exist')
- }
- featuresDir.eachFile({
- match = it.getName() =~ '(org.jboss.tools[^_]+)_.*v(.*)\\.jar'
- if (match.matches()) {
- version = match[0][2]
- features += ","+match[0][1]+'.feature.group'
- }
- })
- features = features.substring(1)
- def output=properties['destdir']+'/jboss-tools-'+version+'.zip'
- println 'Detetected JBoss Tools version '+version
- majorVersion = '3.2.0'
+ )
+ println 'Searching for features and detecting version'
+ def version = ""
+ def features = ""
+ def featuresDir = new File(properties['tmpdir']+'/upd-site/features')
+ if (!featuresDir.isDirectory() || !featuresDir.exists()) {
+ ant.fail(message:'Update site unzip error, '+properties['tmpdir']+'/upd-site/features does not exist')
+ }
+ featuresDir.eachFile({
+ match = it.getName() =~ '(org.jboss.tools[^_]+)_.*v(.*)\\.jar'
+ if (match.matches()) {
+ version = match[0][2]
+ features += ","+match[0][1]+'.feature.group'
+ }
+ })
+ features = features.substring(1)
+ output=properties['destdir']+'/jboss-tools-'+version+'.zip'
+ properties['runtimeArchive']='../../jboss-tools-'+version+'.zip'
+ println 'Detetected JBoss Tools version '+version
+ majorVersion = '3.2.0'
- // jbosstools-3.2.0.M2.aggregate-Update-2010-09-08_17-17-54-H243a.zip
- match = properties['get.zip.jboss.tools'] =~ '.*/jbosstools-(\\d\\.\\d\\.\\d).*'
- if (match.matches()) majorVersion = match[0][1]
+ // jbosstools-3.2.0.M2.aggregate-Update-2010-09-08_17-17-54-H243a.zip
+ match = properties['get.zip.jboss.tools'] =~ '.*/jbosstools-(\\d\\.\\d\\.\\d).*'
+ if (match.matches()) majorVersion = match[0][1]
+ majorVersion=properties['jbt.build.prefix']+'-'+majorVersion
+ buildID = version.split('-')
+ cal = Calendar.instance
+ properties['perf.buildID'] = majorVersion+'_'+buildID[0] + buildID[1]+'_'+ df_date.format(cal.time)
- majorVersion='R-'+majorVersion
- println 'Setting up properties'
- properties['runtimeArchive']='../../jboss-tools-'+version+'.zip'
- import java.text.SimpleDateFormat;
- buildID = version.split('-')
- buildType = properties['jbt.build.type']
- if ('R'.equals(buildType))
- {
- cal = Calendar.instance
- df_date = new SimpleDateFormat("yyyyMMdd")
- df_time = new SimpleDateFormat("HHmm")
- properties['perf.buildID'] = majorVersion+'_'+buildID[0] + buildID[1]+'_'+ df_date.format(cal.time)+ df_time.format(cal.time)
}
- else if (buildType == 'x' ) {
- properties['perf.buildID'] = 'I'+buildID[0]+'-'+buildID[1]
+
+ println 'Unzipping base eclipse'
+ def file = properties['libdir']+'/'+properties['zip.eclipse.j2ee']
+ if (file.endsWith('.tar.gz')) {
+ ant.delete( file:file+'.tar')
+ ant.gunzip(src:file,dest:file+'.tar')
+ ant.untar(src:file+'.tar',dest:properties['tmpdir'])
+ ant.delete( file:file+'.tar')
}
- else {
- ant.fail('Unexpected value of property jbt.built.type')
+ else if (file.endsWith('.zip')) {
+ ant.unzip( src:file,dest:properties['tmpdir'],overwrite:'true' )
}
+ ant.chmod(perm:'ugo+rwx', file:properties['tmpdir']+'/eclipse/eclipse')
+ if (!install) {
+ // determine eclipse version and set buildID
+ def eprops = new Properties()
+ eprops.load(new FileInputStream(properties['tmpdir']+'/eclipse/configuration/config.ini'))
+ println 'Loaded'
+ df_edate = new SimpleDateFormat('yyyyMMdd-HHmm')
+ buildDate = df_edate.parse(eprops['eclipse.buildId'].substring(1))
+ eprops.load(new FileInputStream(properties['tmpdir']+'/eclipse/.eclipseproduct'))
+ majorVersion = properties['jbt.build.prefix']+'-'+eprops['version']
+ println df_date.format(buildDate)
+ cal = Calendar.instance
+ properties['perf.buildID']=majorVersion+'_'+df_date.format(buildDate)+'_'+df_date.format(cal.time)
+ output=properties['destdir']+'/eclipse-'+majorVersion+'_'+df_date.format(buildDate)+'.zip'
+ properties['runtimeArchive']='../../eclipse-'+majorVersion+'_'+df_date.format(buildDate)+'.zip'
+ }
+ println 'Setting up properties'
if (properties['os.linux']!="") {
properties['osgi.os']='linux'
properties['osgi.ws']='gtk'
@@ -195,45 +215,34 @@
println 'Property: runtimeArchive='+properties['runtimeArchive']
println 'Property: '+reconcilerPropKey+'='+properties[reconcilerPropKey]
if (new File(output).exists()) {
- println 'Result file '+output+' exists, skipping installation'
+ println 'Result file '+output+' exists, DONE'
return
- }
- println 'Unzipping base eclipse'
- def file = properties['libdir']+'/'+properties['zip.eclipse.j2ee']
- if (file.endsWith('.tar.gz')) {
- ant.delete( file:file+'.tar')
- ant.gunzip(src:file,dest:file+'.tar')
- ant.untar(src:file+'.tar',dest:properties['tmpdir'])
- ant.delete( file:file+'.tar')
- }
- else if (file.endsWith('.zip')) {
- ant.unzip( src:file,dest:properties['tmpdir'],overwrite:'true' )
- }
- ant.chmod(perm:'ugo+rwx', file:properties['tmpdir']+'/eclipse/eclipse')
-
+ }
+ if (install) {
println 'Installing all JBoss Tools'
- def eclipseSites="http://download.eclipse.org/tptp/updates,http://download.eclipse.org/tool..."
- def thirdpartySites=eclipseSites+",http://download.eclipse.org/birt/update-site/2.6,http://m2eclipse.sonatype.org/sites/m2e,http://m2eclipse.sonatype.org/sites/m2e-extras,http://dl.google.com/eclipse/plugin/3.6"
- def eclipse = new File(properties['tmpdir']+'/eclipse').getAbsolutePath()
- def repo = new File(properties['tmpdir']+'/upd-site').getAbsolutePath()
- def cmd = eclipse+'/eclipse'
- cmd+=" -application org.eclipse.equinox.p2.director"
- cmd+=" -nosplash"
- cmd+=" --launcher.suppressErrors"
- cmd+=" -consoleLog"
- cmd+=" -p2.os "+properties['osgi.os']
- cmd+=" -p2.ws "+properties['osgi.ws']
- cmd+=" -p2.arch "+properties['osgi.arch']
- cmd+=" -profile epp.package.jee"
- cmd+=" -destination " + eclipse
- cmd+=" -bundlepool " + eclipse
- cmd+=" -installIUs "+features
- cmd+=" -repository file:"+repo+",file:"+eclipse+","+thirdpartySites
- proc = cmd.execute (null, new File(eclipse))
- proc.consumeProcessOutput (System.out, System.err)
- proc.waitFor()
- if (proc.exitValue()!=0) {
- ant.fail(message:'Unable to install JBoss Tools, exit value :'+proc.exitValue())
+ def eclipseSites="http://download.eclipse.org/tptp/updates,http://download.eclipse.org/tool..."
+ def thirdpartySites=eclipseSites+",http://download.eclipse.org/birt/update-site/2.6,http://m2eclipse.sonatype.org/sites/m2e,http://m2eclipse.sonatype.org/sites/m2e-extras,http://dl.google.com/eclipse/plugin/3.6"
+ def eclipse = new File(properties['tmpdir']+'/eclipse').getAbsolutePath()
+ def repo = new File(properties['tmpdir']+'/upd-site').getAbsolutePath()
+ def cmd = eclipse+'/eclipse'
+ cmd+=" -application org.eclipse.equinox.p2.director"
+ cmd+=" -nosplash"
+ cmd+=" --launcher.suppressErrors"
+ cmd+=" -consoleLog"
+ cmd+=" -p2.os "+properties['osgi.os']
+ cmd+=" -p2.ws "+properties['osgi.ws']
+ cmd+=" -p2.arch "+properties['osgi.arch']
+ cmd+=" -profile epp.package.jee"
+ cmd+=" -destination " + eclipse
+ cmd+=" -bundlepool " + eclipse
+ cmd+=" -installIUs "+features
+ cmd+=" -repository file:"+repo+",file:"+eclipse+","+thirdpartySites
+ proc = cmd.execute (null, new File(eclipse))
+ proc.consumeProcessOutput (System.out, System.err)
+ proc.waitFor()
+ if (proc.exitValue()!=0) {
+ ant.fail(message:'Unable to install JBoss Tools, exit value :'+proc.exitValue())
+ }
}
println 'Building results'
ant.delete(file:output)
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties 2011-03-29 14:33:13 UTC (rev 30103)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.properties 2011-03-29 14:59:19 UTC (rev 30104)
@@ -1,20 +1,22 @@
jbt.dependencies.folder=libs
# property with format config=<host config name>;jvm=<jvm name>
-jbt.host.desc=config=Linux1;jvm=sun
+jbt.host.desc=config=myhost;jvm=sun
workdir=workdir
# set of tests to run
tests=all
#tests=ant
-# setup build Type: R - for release (GA, milestontes) - will be used for baselining
-# x - otherwise
-jbt.build.type=x
+jbt.build.prefix=JBT
+#jbt.build.prefix=JBT
+#install JBoss Tools on top of eclipse?
+jbt.install.tools=true
# URL of JBossTools build
-#get.zip.jboss.tools=http://download.jboss.org/jbosstools/builds/nightly/3.2_stable_branch/2011-03-21_12-29-04-H586/all/jbosstools-3.2_stable_branch.aggregate-Update-2011-03-21_12-29-04-H586.zip
-#database connection
+get.zip.jboss.tools=http://download.jboss.org/jbosstools/builds/nightly/3.2_stable_branch/2011-03-21_12-29-04-H586/all/jbosstools-3.2_stable_branch.aggregate-Update-2011-03-21_12-29-04-H586.zip
+# database connection
# use //<IP> for network DB or <path> for local DB
-#jbt.perf.db.loc=//derbydb.example.com
+#jbt.perf.db.loc=//perfdb.example.com
jbt.perf.db.loc=/tmp/perfdb
# setup connection properties
-jbt.perf.db.props=create=true;dbname=jbt;dbuser=jbt;dbpasswd=pass
+jbt.perf.db.props=create=true;dbname=jbt;dbuser=jbds;dbpasswd=secret
+perf.dimensions=CPU Time,Kernel Time,Elapsed Process,Used Java Heap
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml 2011-03-29 14:33:13 UTC (rev 30103)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml 2011-03-29 14:59:19 UTC (rev 30104)
@@ -24,6 +24,7 @@
<property name="perf.memory" value="-Xms256M -Xmx512M -XX:MaxPermSize=256M"/>
<property name="perf.db" value="-Declipse.perf.dbloc=${jbt.perf.db.loc};${jbt.perf.db.props}"/>
<property name="perf.config" value="-Declipse.perf.config=build=${perf.buildID};${jbt.host.desc}"/>
+ <property name="perf.dim.config" value="-Declipse.perf.default.dim="${perf.default.dim}" -Declpise.perf.results.dimensions="${perf.dimensions}""/>
<condition property="perf.baseBuild" value="-Declipse.perf.assertAgainst=build=${perf.baseBuildID};host=localhost;jvm=sun" else="">
<and>
<isset property="perf.baseBuildID"/>
@@ -61,7 +62,7 @@
<arg line="-D${clean}=true"/>
<arg line="-logger org.apache.tools.ant.DefaultLogger"/>
- <arg line="-Dvmargs='${perf.memory} ${perf.db} ${perf.config} ${perf.baseBuild}'"/>
+ <arg line="-Dvmargs='${perf.memory} ${perf.db} ${perf.config} ${perf.dim.config} ${perf.baseBuild}'"/>
<arg line="-DruntimeArchive=${runtimeArchive}"/>
<arg line="-Dtest.target=performance"/>
</java>
13 years