JBoss Tools SVN: r18667 - trunk/common/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-11-12 14:32:07 -0500 (Thu, 12 Nov 2009)
New Revision: 18667
Modified:
trunk/common/releng/build.properties
Log:
use MY_JAVA_HOME as set by run.sh
Modified: trunk/common/releng/build.properties
===================================================================
--- trunk/common/releng/build.properties 2009-11-12 19:30:26 UTC (rev 18666)
+++ trunk/common/releng/build.properties 2009-11-12 19:32:07 UTC (rev 18667)
@@ -14,11 +14,11 @@
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
-# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables
-JAVA_HOME=${JAVA_HOME_PARENT}
-JAVA14_HOME=${JAVA_HOME_PARENT}
-JAVA50_HOME=${JAVA_HOME_PARENT}
-JAVA60_HOME=${JAVA_HOME_PARENT}
+# MY_JAVA_HOME is this Hudson slave's environment's JAVA_HOME, renamed to avoid collision with default in org.eclipse.dash.common.releng/server.properties
+JAVA_HOME=${MY_JAVA_HOME}
+JAVA14_HOME=${MY_JAVA_HOME}
+JAVA50_HOME=${MY_JAVA_HOME}
+JAVA60_HOME=${MY_JAVA_HOME}
dependencyURLs=\
http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
15 years, 1 month
JBoss Tools SVN: r18666 - trunk/bpel/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-11-12 14:30:26 -0500 (Thu, 12 Nov 2009)
New Revision: 18666
Modified:
trunk/bpel/releng/build.properties
Log:
use MY_JAVA_HOME as set by run.sh
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2009-11-12 19:28:57 UTC (rev 18665)
+++ trunk/bpel/releng/build.properties 2009-11-12 19:30:26 UTC (rev 18666)
@@ -14,9 +14,10 @@
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
-JAVA14_HOME=${JAVA_HOME}
-JAVA50_HOME=${JAVA_HOME}
-JAVA60_HOME=${JAVA_HOME}
+JAVA_HOME=${MY_JAVA_HOME}
+JAVA14_HOME=${MY_JAVA_HOME}
+JAVA50_HOME=${MY_JAVA_HOME}
+JAVA60_HOME=${MY_JAVA_HOME}
dependencyURLs=\
http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
15 years, 1 month
JBoss Tools SVN: r18665 - trunk/common/releng/hudson.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-11-12 14:28:57 -0500 (Thu, 12 Nov 2009)
New Revision: 18665
Modified:
trunk/common/releng/hudson/run.sh
Log:
collect Hudson's version of Java as defined globally for a given node
Modified: trunk/common/releng/hudson/run.sh
===================================================================
--- trunk/common/releng/hudson/run.sh 2009-11-12 19:16:15 UTC (rev 18664)
+++ trunk/common/releng/hudson/run.sh 2009-11-12 19:28:57 UTC (rev 18665)
@@ -29,20 +29,9 @@
export ANT_HOME=/opt/apache-ant-1.7.1
fi
-# 32-bit - values defined in ~/config_repository/resources/common.variables
-export JAVA14
-export JAVA15
-export JAVA16
+# collect Hudson's version of Java as defined globally for a given node
+MY_JAVA_HOME=${JAVA_HOME}
-# override for 64-bit slaves - must search for the 64-bit JVMs because common_bash.sh fails to load them from ~/config_repository/resources/common.variables
-# workaround for https://jira.jboss.org/jira/browse/JBQA-2751
-if [[ ${uname/x86_64/} != $uname ]]; then
- d=$(find /qa/tools/opt/x86_64 -maxdepth 2 -name "jdk1.5.*" -type d -not -name "*beta*"| sort | tail -1)
- if [[ $d ]]; then export JAVA15=$d; fi
- d=$(find /qa/tools/opt/x86_64 -maxdepth 2 -name "jdk1.6.*" -type d -not -name "*beta*"| sort | tail -1)
- if [[ $d ]]; then export JAVA16=$d; fi
-fi
-
# cache of downloaded requirements and other binaries
downloadsDir="${WORKSPACE}/downloads"; if [[ ! -d $downloadsDir ]]; then mkdir -p $downloadsDir; fi
15 years, 1 month
JBoss Tools SVN: r18663 - trunk/bpel/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-11-12 14:14:34 -0500 (Thu, 12 Nov 2009)
New Revision: 18663
Modified:
trunk/bpel/releng/build.properties
Log:
simplify config using Hudson default properties rather than special overrides
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2009-11-12 18:46:22 UTC (rev 18662)
+++ trunk/bpel/releng/build.properties 2009-11-12 19:14:34 UTC (rev 18663)
@@ -14,11 +14,9 @@
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
-# JBoss Hudson Variables defined in /home/hudson/config_repository/resources/common.variables
-JAVA_HOME=${JAVA_HOME_PARENT}
-JAVA14_HOME=${JAVA_HOME_PARENT}
-JAVA50_HOME=${JAVA_HOME_PARENT}
-JAVA60_HOME=${JAVA_HOME_PARENT}
+JAVA14_HOME=${JAVA_HOME}
+JAVA50_HOME=${JAVA_HOME}
+JAVA60_HOME=${JAVA_HOME}
dependencyURLs=\
http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\
15 years, 1 month
JBoss Tools SVN: r18662 - trunk/tests/features/org.jboss.tools.all.test.feature.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-11-12 13:46:22 -0500 (Thu, 12 Nov 2009)
New Revision: 18662
Modified:
trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml
Log:
add org.eclipse.ant.optional.junit + org.eclipse.test
Modified: trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-11-12 17:32:26 UTC (rev 18661)
+++ trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-11-12 18:46:22 UTC (rev 18662)
@@ -23,6 +23,19 @@
</license>
<plugin
+ id="org.eclipse.ant.optional.junit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
+ id="org.eclipse.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
id="org.jboss.tools.common.model.test"
download-size="0"
install-size="0"
15 years, 1 month
JBoss Tools SVN: r18661 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-11-12 12:32:26 -0500 (Thu, 12 Nov 2009)
New Revision: 18661
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5190
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-12 17:23:35 UTC (rev 18660)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-12 17:32:26 UTC (rev 18661)
@@ -11,7 +11,6 @@
package org.jboss.tools.common.el.core.refactoring;
import java.io.IOException;
-import java.io.InputStream;
import java.util.List;
import java.util.StringTokenizer;
@@ -82,73 +81,7 @@
protected IJavaElement javaElement;
protected IJavaSearchScope searchScope;
- // performance measure
- private int totalSize = 0;
- private int filesNumber = 0;
- private long startTime = 0;
- private long stopTime = 0;
- private long startMem = 0;
- private long stopMem = 0;
- private boolean log = false;
-
- private void clearHistory(){
- totalSize = 0;
- filesNumber = 0;
- startTime = 0;
- stopTime = 0;
- startMem = 0;
- stopMem = 0;
- }
-
- private void startStatistics(){
- clearHistory();
- startTime = System.currentTimeMillis();
- startMem = Runtime.getRuntime().freeMemory();
- }
-
- private void stopStatistic(){
- stopTime = System.currentTimeMillis();
- stopMem = Runtime.getRuntime().freeMemory();
- printELSearchStatistics();
- }
-
- private void collectStatistic(int fileSize){
- filesNumber++;
- totalSize += fileSize;
- }
-
- private void printELSearchStatistics(){
- if(log){
- System.out.println("EL Search"); //$NON-NLS-1$
- System.out.println("Total files number: "+getFilesNumber()); //$NON-NLS-1$
- System.out.println("Total files size: "+getTotlalFilesSize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
- System.out.println("Memory usage size: "+getTotlalMemorySize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
- System.out.println("Free Memory size: "+getRestMemorySize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
- System.out.println("Total time: "+getTotalTime()+" sec"); //$NON-NLS-1$ $NON-NLS-2$
- }
- }
-
- private double getTotlalFilesSize(){
- return (double)totalSize/(1024*1025);
- }
-
- private double getTotlalMemorySize(){
- return (double)(startMem-stopMem)/(1024*1025);
- }
-
- private double getRestMemorySize(){
- return (double)stopMem/(1024*1025);
- }
-
- private int getFilesNumber(){
- return filesNumber;
- }
-
- private double getTotalTime(){
- return (double)(stopTime - startTime)/1000;
- }
-
public RefactorSearcher(IFile baseFile, String propertyName){
this.baseFile = baseFile;
this.propertyName = propertyName;
@@ -167,7 +100,7 @@
if(baseFile == null)
return;
- startStatistics();
+ //startStatistics();
IProject[] projects = getProjects();
for (IProject project : projects) {
@@ -197,7 +130,7 @@
else
scan(project);
}
- stopStatistic();
+ //stopStatistic();
}
protected void updateEnvironment(IProject project){
@@ -239,7 +172,7 @@
String content = null;
try {
content = FileUtil.readStream(file);
- collectStatistic(content.length());
+ //collectStatistic(content.length());
} catch (CoreException e) {
ELCorePlugin.getDefault().logError(e);
}
@@ -261,7 +194,7 @@
String content = null;
try {
content = FileUtil.readStream(file);
- collectStatistic(content.length());
+ //collectStatistic(content.length());
} catch (CoreException e) {
ELCorePlugin.getDefault().logError(e);
}
@@ -523,4 +456,71 @@
}
}
}
+ // performance measure
+// private int totalSize = 0;
+// private int filesNumber = 0;
+// private long startTime = 0;
+// private long stopTime = 0;
+// private long startMem = 0;
+// private long stopMem = 0;
+//
+// private boolean log = false;
+//
+// private void clearHistory(){
+// totalSize = 0;
+// filesNumber = 0;
+// startTime = 0;
+// stopTime = 0;
+// startMem = 0;
+// stopMem = 0;
+// }
+//
+// private void startStatistics(){
+// clearHistory();
+// startTime = System.currentTimeMillis();
+// startMem = Runtime.getRuntime().freeMemory();
+// }
+//
+// private void stopStatistic(){
+// stopTime = System.currentTimeMillis();
+// stopMem = Runtime.getRuntime().freeMemory();
+// printELSearchStatistics();
+// }
+//
+// private void collectStatistic(int fileSize){
+// filesNumber++;
+// totalSize += fileSize;
+// }
+//
+// private void printELSearchStatistics(){
+// if(log){
+// System.out.println("EL Search"); //$NON-NLS-1$
+// System.out.println("Total files number: "+getFilesNumber()); //$NON-NLS-1$
+// System.out.println("Total files size: "+getTotlalFilesSize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
+// System.out.println("Memory usage size: "+getTotlalMemorySize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
+// System.out.println("Free Memory size: "+getRestMemorySize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
+// System.out.println("Total time: "+getTotalTime()+" sec"); //$NON-NLS-1$ $NON-NLS-2$
+// }
+// }
+//
+// private double getTotlalFilesSize(){
+// return (double)totalSize/(1024*1025);
+// }
+//
+// private double getTotlalMemorySize(){
+// return (double)(startMem-stopMem)/(1024*1025);
+// }
+//
+// private double getRestMemorySize(){
+// return (double)stopMem/(1024*1025);
+// }
+//
+// private int getFilesNumber(){
+// return filesNumber;
+// }
+//
+// private double getTotalTime(){
+// return (double)(stopTime - startTime)/1000;
+// }
+
}
\ No newline at end of file
15 years, 1 month
JBoss Tools SVN: r18660 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-11-12 12:23:35 -0500 (Thu, 12 Nov 2009)
New Revision: 18660
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5190
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-12 16:58:09 UTC (rev 18659)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-11-12 17:23:35 UTC (rev 18660)
@@ -74,7 +74,6 @@
private static final String GET = "get"; //$NON-NLS-1$
private static final String SET = "set"; //$NON-NLS-1$
private static final String IS = "is"; //$NON-NLS-1$
-
protected static final String SEAM_PROPERTIES_FILE = "seam.properties"; //$NON-NLS-1$
@@ -83,6 +82,73 @@
protected IJavaElement javaElement;
protected IJavaSearchScope searchScope;
+ // performance measure
+ private int totalSize = 0;
+ private int filesNumber = 0;
+ private long startTime = 0;
+ private long stopTime = 0;
+ private long startMem = 0;
+ private long stopMem = 0;
+
+ private boolean log = false;
+
+ private void clearHistory(){
+ totalSize = 0;
+ filesNumber = 0;
+ startTime = 0;
+ stopTime = 0;
+ startMem = 0;
+ stopMem = 0;
+ }
+
+ private void startStatistics(){
+ clearHistory();
+ startTime = System.currentTimeMillis();
+ startMem = Runtime.getRuntime().freeMemory();
+ }
+
+ private void stopStatistic(){
+ stopTime = System.currentTimeMillis();
+ stopMem = Runtime.getRuntime().freeMemory();
+ printELSearchStatistics();
+ }
+
+ private void collectStatistic(int fileSize){
+ filesNumber++;
+ totalSize += fileSize;
+ }
+
+ private void printELSearchStatistics(){
+ if(log){
+ System.out.println("EL Search"); //$NON-NLS-1$
+ System.out.println("Total files number: "+getFilesNumber()); //$NON-NLS-1$
+ System.out.println("Total files size: "+getTotlalFilesSize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
+ System.out.println("Memory usage size: "+getTotlalMemorySize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
+ System.out.println("Free Memory size: "+getRestMemorySize()+" Mb"); //$NON-NLS-1$ $NON-NLS-2$
+ System.out.println("Total time: "+getTotalTime()+" sec"); //$NON-NLS-1$ $NON-NLS-2$
+ }
+ }
+
+ private double getTotlalFilesSize(){
+ return (double)totalSize/(1024*1025);
+ }
+
+ private double getTotlalMemorySize(){
+ return (double)(startMem-stopMem)/(1024*1025);
+ }
+
+ private double getRestMemorySize(){
+ return (double)stopMem/(1024*1025);
+ }
+
+ private int getFilesNumber(){
+ return filesNumber;
+ }
+
+ private double getTotalTime(){
+ return (double)(stopTime - startTime)/1000;
+ }
+
public RefactorSearcher(IFile baseFile, String propertyName){
this.baseFile = baseFile;
this.propertyName = propertyName;
@@ -101,6 +167,8 @@
if(baseFile == null)
return;
+ startStatistics();
+
IProject[] projects = getProjects();
for (IProject project : projects) {
if(project == null) continue;
@@ -129,6 +197,7 @@
else
scan(project);
}
+ stopStatistic();
}
protected void updateEnvironment(IProject project){
@@ -170,6 +239,7 @@
String content = null;
try {
content = FileUtil.readStream(file);
+ collectStatistic(content.length());
} catch (CoreException e) {
ELCorePlugin.getDefault().logError(e);
}
@@ -191,6 +261,7 @@
String content = null;
try {
content = FileUtil.readStream(file);
+ collectStatistic(content.length());
} catch (CoreException e) {
ELCorePlugin.getDefault().logError(e);
}
15 years, 1 month
JBoss Tools SVN: r18659 - trunk/tests/features/org.jboss.tools.all.test.feature.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-11-12 11:58:09 -0500 (Thu, 12 Nov 2009)
New Revision: 18659
Modified:
trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml
Log:
add org.jboss.tools.ui.bot.ext to all.test.feature
Modified: trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-11-12 16:55:41 UTC (rev 18658)
+++ trunk/tests/features/org.jboss.tools.all.test.feature/feature.xml 2009-11-12 16:58:09 UTC (rev 18659)
@@ -278,4 +278,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.ui.bot.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
15 years, 1 month