JBoss Tools SVN: r25461 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-04 12:32:31 -0400 (Mon, 04 Oct 2010)
New Revision: 25461
Modified:
trunk/build/target-platform/targetUpdateFromRepo.xml
Log:
add help target to expose useful commandline options
Modified: trunk/build/target-platform/targetUpdateFromRepo.xml
===================================================================
--- trunk/build/target-platform/targetUpdateFromRepo.xml 2010-10-04 16:30:33 UTC (rev 25460)
+++ trunk/build/target-platform/targetUpdateFromRepo.xml 2010-10-04 16:32:31 UTC (rev 25461)
@@ -1,12 +1,22 @@
-<project default="custom.build" name="jbosstools target platform pom.xml + site.xml generator">
+<project default="custom.build" name="jbosstools target platform updater">
+
+ <!-- must set these commandline if not using defaults -->
+ <property name="targetFile" value="e361-wtp322.target" />
+ <property name="repoDir" value="./REPO" />
+
<property name="tmpDir" value="${java.io.tmpdir}/targetUpdateFromRepo" />
- <property name="targetFile" value="e361-wtp322.target" />
- <property name="repoDir" value="./REPO_SR1" />
<property name="outputDir" value="${basedir}" />
<!-- Instead of overwriting, can also create a new .target file in a different outputDir
<property name="outputDir" value="${tmpDir}" />
-->
+ <target name="help">
+ <echo>Must set these properties (or use defaults shown):
+
+ ant -f targetUpdateFromRepo.xml -DrepoDir=${repoDir} \
+ -DtargetFile=${targetFile}</echo>
+ </target>
+
<target name="custom.build" depends="check.content.xml, get.content.xml, copy.content.xml, contentXml2artifactVersions.xsl, target2targetTemplate.xsl, updateTargetFile, cleanup" />
<target name="check.content.xml" description="if content.jar, unpack to get content.xml">
13 years, 8 months
JBoss Tools SVN: r25460 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-04 12:30:33 -0400 (Mon, 04 Oct 2010)
New Revision: 25460
Modified:
trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
Log:
refactor for consistency
Modified: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-04 16:18:40 UTC (rev 25459)
+++ trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-04 16:30:33 UTC (rev 25460)
@@ -15,17 +15,17 @@
/abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java \
-nosplash -data /tmp/workspace -consolelog -application \
org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
- -Ddebug=true -DfollowStrict=true -Drepo.dir=`pwd`/REPO/
+ -Ddebug=true -DfollowStrict=true -DrepoDir=`pwd`/REPO/
</echo>
</target>
-<target unless="repo.dir" name="init">
-<fail>Must set -Drepo.dir=/abs/path/to/download/artifacts/</fail>
+<target unless="repoDir" name="init">
+<fail>Must set -DrepoDir=/abs/path/to/download/artifacts/</fail>
</target>
-<target if="repo.dir" description="Download from target platform definition" depends="init" name="download.target.platform">
+<target if="repoDir" description="Download from target platform definition" depends="init" name="download.target.platform">
<property value="false" name="verbose"/>
<property value="false" name="followStrict"/>
-<echo level="info">Download features/plugins into ${repo.dir}</echo>
-<p2.mirror verbose="${verbose}" destination="file:${repo.dir}">
+<echo level="info">Download features/plugins into ${repoDir}</echo>
+<p2.mirror verbose="${verbose}" destination="file:${repoDir}">
<slicingOptions followStrict="${followStrict}" includeFeatures="true"/>
<source>
<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
13 years, 8 months
JBoss Tools SVN: r25459 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-04 12:18:40 -0400 (Mon, 04 Oct 2010)
New Revision: 25459
Modified:
trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
trunk/build/target-platform/target2p2mirrorXml.xsl
Log:
tweak target2p2mirrorXml.xsl generator output (help text)
Modified: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-04 15:50:27 UTC (rev 25458)
+++ trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-04 16:18:40 UTC (rev 25459)
@@ -8,17 +8,14 @@
Use followStrict="true" to prevent downloading all
requirements not included in the target platform
- or
- followStrict="false" to fetch everything
+ or followStrict="false" to fetch everything
To run this script:
- /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
- /tmp/workspace -consolelog -application \
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java \
+ -nosplash -data /tmp/workspace -consolelog -application \
org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
- -Ddebug=true \
- -DfollowStrict=true \
- -Drepo.dir=/tmp/REPO/
+ -Ddebug=true -DfollowStrict=true -Drepo.dir=`pwd`/REPO/
</echo>
</target>
<target unless="repo.dir" name="init">
Modified: trunk/build/target-platform/target2p2mirrorXml.xsl
===================================================================
--- trunk/build/target-platform/target2p2mirrorXml.xsl 2010-10-04 15:50:27 UTC (rev 25458)
+++ trunk/build/target-platform/target2p2mirrorXml.xsl 2010-10-04 16:18:40 UTC (rev 25459)
@@ -25,17 +25,14 @@
Use followStrict="true" to prevent downloading all
requirements not included in the target platform
- or
- followStrict="false" to fetch everything
+ or followStrict="false" to fetch everything
To run this script:
- /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
- /tmp/workspace -consolelog -application \
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java \
+ -nosplash -data /tmp/workspace -consolelog -application \
org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
- -Ddebug=true \
- -DfollowStrict=true \
- -Drepo.dir=/tmp/REPO/
+ -Ddebug=true -DfollowStrict=true -Drepo.dir=`pwd`/REPO/
</echo>
</target>
<target name="init" unless="repo.dir">
13 years, 8 months
JBoss Tools SVN: r25458 - in branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console: src/org/hibernate/eclipse/launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-10-04 11:50:27 -0400 (Mon, 04 Oct 2010)
New Revision: 25458
Modified:
branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties
branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java
Log:
https://jira.jboss.org/browse/JBIDE-7249 - fix for Beta1 branch
Modified: branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties
===================================================================
--- branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties 2010-10-04 15:49:59 UTC (rev 25457)
+++ branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties 2010-10-04 15:50:27 UTC (rev 25458)
@@ -6,7 +6,9 @@
doc/,\
META-INF/,\
about.html,\
+ ant-tasks-description.xml,\
plugin.properties
src.includes = src/,\
icons/,\
- doc/
+ doc/,\
+ ant-tasks-description.xml
Modified: branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java
===================================================================
--- branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java 2010-10-04 15:49:59 UTC (rev 25457)
+++ branches/jbosstools-3.2.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java 2010-10-04 15:50:27 UTC (rev 25458)
@@ -40,7 +40,7 @@
/**
* path to file to store description
*/
- public static final String ANT_TASKS_DESCRIPTION_PATH = "ant-tasks-description.xml".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String ANT_TASKS_DESCRIPTION_PATH = "ant-tasks-description.xml"; //$NON-NLS-1$
public static class AttributeDescription {
public String name;
@@ -123,6 +123,7 @@
HibernateConsolePlugin.getDefault().logErrorMessage("getResource: ", e); //$NON-NLS-1$
}
if (resourceFile == null || !resourceFile.exists()) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("Can't read file: " + ANT_TASKS_DESCRIPTION_PATH, (Throwable)null); //$NON-NLS-1$
return null;
}
StringBuffer cbuf = new StringBuffer((int) resourceFile.length());
13 years, 8 months
JBoss Tools SVN: r25457 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-10-04 11:49:59 -0400 (Mon, 04 Oct 2010)
New Revision: 25457
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java
Log:
https://jira.jboss.org/browse/JBIDE-7249 - fix for trunk
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java 2010-10-04 15:43:57 UTC (rev 25456)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java 2010-10-04 15:49:59 UTC (rev 25457)
@@ -40,7 +40,7 @@
/**
* path to file to store description
*/
- public static final String ANT_TASKS_DESCRIPTION_PATH = "ant-tasks-description.xml".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String ANT_TASKS_DESCRIPTION_PATH = "ant-tasks-description.xml"; //$NON-NLS-1$
public static class AttributeDescription {
public String name;
@@ -123,6 +123,7 @@
HibernateConsolePlugin.getDefault().logErrorMessage("getResource: ", e); //$NON-NLS-1$
}
if (resourceFile == null || !resourceFile.exists()) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("Can't read file: " + ANT_TASKS_DESCRIPTION_PATH, (Throwable)null); //$NON-NLS-1$
return null;
}
StringBuffer cbuf = new StringBuffer((int) resourceFile.length());
13 years, 8 months
JBoss Tools SVN: r25456 - branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-10-04 11:43:57 -0400 (Mon, 04 Oct 2010)
New Revision: 25456
Modified:
branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
Log:
merging https://jira.jboss.org/browse/JBIDE-7232
Modified: branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
===================================================================
--- branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-10-04 15:29:03 UTC (rev 25455)
+++ branches/jbosstools-3.2.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-10-04 15:43:57 UTC (rev 25456)
@@ -949,14 +949,14 @@
Object parentTask = taskType.getParent();
if(parentTask instanceof TaskType) {
- if(((TaskType) parentTask).getId().equals(TaskTypeManager.TASK_ID_INPUT)) {
+ if(((TaskType) parentTask).getId().equals(TaskTypeManager.TASK_ID_INPUT) && !taskType.getId().equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) {
for (AbstractSmooksGraphicalModel abstractSmooksGraphicalModel : children) {
if (abstractSmooksGraphicalModel instanceof InputDataContianerModel) {
createConnection(abstractSmooksGraphicalModel);
break;
}
}
- } else if(((TaskType) parentTask).getId().equals(TaskTypeManager.TASK_ID_JAVA_MAPPING)) {
+ } else {
for (AbstractSmooksGraphicalModel abstractSmooksGraphicalModel : children) {
if (!(abstractSmooksGraphicalModel instanceof InputDataContianerModel)) {
if (canCreateConnection(abstractSmooksGraphicalModel)) {
13 years, 8 months
JBoss Tools SVN: r25455 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-10-04 11:29:03 -0400 (Mon, 04 Oct 2010)
New Revision: 25455
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties
Log:
https://jira.jboss.org/browse/JBIDE-7249 - fix in trunk
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties 2010-10-04 15:10:25 UTC (rev 25454)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/build.properties 2010-10-04 15:29:03 UTC (rev 25455)
@@ -6,7 +6,9 @@
doc/,\
META-INF/,\
about.html,\
+ ant-tasks-description.xml,\
plugin.properties
src.includes = src/,\
icons/,\
- doc/
+ doc/,\
+ ant-tasks-description.xml
13 years, 8 months
JBoss Tools SVN: r25454 - branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-04 11:10:25 -0400 (Mon, 04 Oct 2010)
New Revision: 25454
Modified:
branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties
Log:
[JBDS-1348] google analytics account corrected
Modified: branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties
===================================================================
--- branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-10-04 14:45:24 UTC (rev 25453)
+++ branches/jbosstools-3.2.0.Beta1/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/messages.properties 2010-10-04 15:10:25 UTC (rev 25454)
@@ -13,7 +13,7 @@
# this is a hack to get into the code freeze deadline. this stuff will be removed with a proper implementation
UsageReport_DialogTitle_JBDS=JBoss Developer Studio Usage
UsageReport_DialogMessage_JBDS=Please allow Red Hat Inc. to receive anonymous usage statistics for this JBoss Developer Studio installation (<a>info</a>).
-UsageReport_GoogleAnalytics_Account_JBDS=UA-18653195-1
+UsageReport_GoogleAnalytics_Account_JBDS=UA-18653195-2
UsageReport_Checkbox_Text_JBDS=Report usage of JBoss Developer Studio to Red Hat Inc.
UsageReport_HostName_JBDS=devstudio.jboss.com
UsageReport_ExplanationPage_JBDS=http://devstudio.jboss.com/usage
13 years, 8 months
JBoss Tools SVN: r25453 - branches/jbosstools-3.2.0.Beta1/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-10-04 10:45:24 -0400 (Mon, 04 Oct 2010)
New Revision: 25453
Modified:
branches/jbosstools-3.2.0.Beta1/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
Log:
patch for JBIDE-6613
Modified: branches/jbosstools-3.2.0.Beta1/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java
===================================================================
--- branches/jbosstools-3.2.0.Beta1/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-10-04 13:29:38 UTC (rev 25452)
+++ branches/jbosstools-3.2.0.Beta1/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-10-04 14:45:24 UTC (rev 25453)
@@ -209,9 +209,16 @@
// Add WSDLs that were resolved as imports, to the list
for (Resource res : resourceSet.getResources())
{
- Definition def = (Definition)res.getContents().get(0);
- if (!wsdlFiles.contains(def))
- wsdlFiles.add(def);
+ // https://jira.jboss.org/browse/JBIDE-6613
+ // fix a dumb mistake: XSDs don't have Definitions
+ // and will cause this to throw a class cast exception
+ Object obj = res.getContents().get(0);
+ if ( obj instanceof Definition )
+ {
+ Definition def = (Definition)obj;
+ if (!wsdlFiles.contains(def))
+ wsdlFiles.add(def);
+ }
}
return wsdlFiles;
@@ -229,8 +236,11 @@
if (DeployUtils.isBPELFile(file)) {
// load it
Process currentProcess = loadBPEL(file, resourceSet);
- // stuff it in bpelFiles
- bpelFiles.add(currentProcess);
+ // https://jira.jboss.org/browse/JBIDE-6613
+ // make sure the BPEL is valid.
+ if (currentProcess!=null)
+ // stuff it in bpelFiles
+ bpelFiles.add(currentProcess);
}
}
13 years, 8 months
JBoss Tools SVN: r25452 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-10-04 09:29:38 -0400 (Mon, 04 Oct 2010)
New Revision: 25452
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7084 , swt bot test was updated.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-10-04 13:13:48 UTC (rev 25451)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-10-04 13:29:38 UTC (rev 25452)
@@ -340,7 +340,6 @@
SWTBotEditor editor2 = SWTTestExt.eclipse.openFile(
JBT_TEST_PROJECT_NAME, "WebContent", "pages", //$NON-NLS-1$ //$NON-NLS-2$
"externalize.properties"); //$NON-NLS-1$
-// bot.sleep(10000);
editor2.toTextEditor().selectLine(1);
String line = editor2.toTextEditor().getSelection();
assertEquals("Created file is incorrect", "Input=Input", line); //$NON-NLS-1$ //$NON-NLS-2$
13 years, 8 months