JBoss Tools SVN: r28143 - trunk/build/installation.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-12 13:10:47 -0500 (Wed, 12 Jan 2011)
New Revision: 28143
Modified:
trunk/build/installation/installJBossTools.xml
Log:
increase timeout for p2 director operation
Modified: trunk/build/installation/installJBossTools.xml
===================================================================
--- trunk/build/installation/installJBossTools.xml 2011-01-12 18:10:23 UTC (rev 28142)
+++ trunk/build/installation/installJBossTools.xml 2011-01-12 18:10:47 UTC (rev 28143)
@@ -186,7 +186,7 @@
<exec executable="${p2.director.install.path}/eclipse"
failonerror="true"
dir="${p2.director.install.path}"
- timeout="900000"
+ timeout="1200000"
taskname="p2.dir"
>
<!-- deprecated application for Eclipse 3.4: org.eclipse.equinox.p2.director.app.application -->
13 years, 10 months
JBoss Tools SVN: r28142 - trunk/build/installation.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-12 13:10:23 -0500 (Wed, 12 Jan 2011)
New Revision: 28142
Modified:
trunk/build/installation/installJBossTools.cmd
trunk/build/installation/installJBossTools.sh
trunk/build/installation/installJBossTools.xml
Log:
add help target instead of comments in ant script; add JBT target platform URL in otherRepos examples
Modified: trunk/build/installation/installJBossTools.cmd
===================================================================
--- trunk/build/installation/installJBossTools.cmd 2011-01-12 18:06:28 UTC (rev 28141)
+++ trunk/build/installation/installJBossTools.cmd 2011-01-12 18:10:23 UTC (rev 28142)
@@ -23,7 +23,8 @@
-f installJBossTools.xml ^
-DsourceZip=c:\eclipse\36clean\jbosstools-3.2.0.M2.aggregate-Update-2010-09-08_17-17-54-H243.zip ^
-DtargetDir=c:\eclipse\36clean\eclipse ^
- -DotherRepos=http://download.eclipse.org/releases/helios/,^
+ -DotherRepos=http://download.jboss.org/jbosstools/updates/target-platform/latest/,^
+http://download.eclipse.org/releases/helios/,^
http://download.eclipse.org/birt/update-site/2.6/,^
http://m2eclipse.sonatype.org/sites/m2e/,^
http://m2eclipse.sonatype.org/sites/m2e-extras/,^
Modified: trunk/build/installation/installJBossTools.sh
===================================================================
--- trunk/build/installation/installJBossTools.sh 2011-01-12 18:06:28 UTC (rev 28141)
+++ trunk/build/installation/installJBossTools.sh 2011-01-12 18:10:23 UTC (rev 28142)
@@ -25,7 +25,8 @@
-f installJBossTools.xml \
-DsourceZip=/home/nboldt/eclipse/36clean/jbosstools-3.2.0.M2.aggregate-Update-2010-09-08_17-17-54-H243a.zip \
-DtargetDir=/home/nboldt/eclipse/36clean/eclipse \
- -DotherRepos=http://download.eclipse.org/releases/helios/,\
+ -DotherRepos=http://download.jboss.org/jbosstools/updates/target-platform/latest/,\
+http://download.eclipse.org/releases/helios/,\
http://download.eclipse.org/birt/update-site/2.6/,\
http://m2eclipse.sonatype.org/sites/m2e/,\
http://m2eclipse.sonatype.org/sites/m2e-extras/,\
Modified: trunk/build/installation/installJBossTools.xml
===================================================================
--- trunk/build/installation/installJBossTools.xml 2011-01-12 18:06:28 UTC (rev 28141)
+++ trunk/build/installation/installJBossTools.xml 2011-01-12 18:10:23 UTC (rev 28142)
@@ -1,6 +1,6 @@
<project default="install">
- <!--
-
+ <target name="help">
+ <echo>
REQUIRMENTS:
This script requires Ant-Contrib. If missing, it will attempt to download
@@ -18,20 +18,25 @@
otherRepos - csv list of local, zipped, or remote update sites from which to install
prereqs (eg., BIRT, Maven); may want these sites:
- http://download.eclipse.org/releases/galileo/,\
- http://download.eclipse.org/birt/update-site/2.5/,\
- http://download.jboss.org/jbosstools/updates/m2eclipse/0.10/
- # http://m2eclipse.sonatype.org/update-dev
+ http://download.jboss.org/jbosstools/updates/target-platform/latest/
+ http://download.eclipse.org/releases/helios/,\
+ http://download.eclipse.org/birt/update-site/2.6/,\
+ http://m2eclipse.sonatype.org/sites/m2e/,\
+ http://m2eclipse.sonatype.org/sites/m2e-extras/,\
+ http://subclipse.tigris.org/update_1.6.x,\
+ http://dl.google.com/eclipse/plugin/3.6/
RUNNING THIS SCRIPT:
/path/to/eclipse-dir/eclipse -consolelog -nosplash -data /tmp \
-application org.eclipse.ant.core.antRunner \
-f /path/to/installJBossTools.xml \
+ -DotherRepos=http://download.jboss.org/jbosstools/updates/target-platform/latest/
-DsourceZip=/path/to/JBossTools-Update-3.1.0.v200909102049M-H274-M3.zip \
-DtargetDir=/path/to/eclipse-dir \
-Dinstall=org.jboss.tools.jmx.sdk.feature.feature.group
- -->
+</echo>
+ </target>
<property name="install" value="" />
<property name="otherRepos" value="" />
13 years, 10 months
JBoss Tools SVN: r28141 - branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-01-12 13:06:28 -0500 (Wed, 12 Jan 2011)
New Revision: 28141
Modified:
branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
Log:
For Green Build. Removed wrong reference to ESB component in facelet meta data.
Modified: branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2011-01-12 17:55:11 UTC (rev 28140)
+++ branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2011-01-12 18:06:28 UTC (rev 28141)
@@ -822,7 +822,7 @@
HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler"
ICON="action.empty" PROPERTIES="validator.edit=true"
WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename">
- <EntityData EntityName="FileESB110">
+ <EntityData EntityName="FacesConfig">
<AttributeData AttributeName="name"/>
</EntityData>
</XActionItem>
@@ -903,4 +903,4 @@
</XChildrenEntities>
<XActionItem kind="list"/>
</XEntityExtension>
-</XModelEntityGroup>
+</XModelEntityGroup>
\ No newline at end of file
13 years, 10 months
JBoss Tools SVN: r28140 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-12 12:55:11 -0500 (Wed, 12 Jan 2011)
New Revision: 28140
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java
Log:
added string-stripping (to remove \n,\t, " ", etc.)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:48:15 UTC (rev 28139)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:55:11 UTC (rev 28140)
@@ -28,7 +28,7 @@
/**
* @author André Dietisheim
- *
+ *
* @param <DELTACLOUDOBJECT>
*/
public abstract class AbstractDOMUnmarshaller<DELTACLOUDOBJECT> {
@@ -41,8 +41,7 @@
this.tagName = tagName;
}
- public DELTACLOUDOBJECT unmarshall(InputStream inputStream, DELTACLOUDOBJECT deltacloudObject)
- throws DeltaCloudClientException {
+ public DELTACLOUDOBJECT unmarshall(InputStream inputStream, DELTACLOUDOBJECT deltacloudObject) throws DeltaCloudClientException {
try {
Element element = getFirstElement(tagName, getDocument(inputStream));
if (element == null) {
@@ -57,8 +56,7 @@
}
- protected Document getDocument(InputStream inputStream) throws ParserConfigurationException, SAXException,
- IOException {
+ protected Document getDocument(InputStream inputStream) throws ParserConfigurationException, SAXException, IOException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder documentBuilder = factory.newDocumentBuilder();
return documentBuilder.parse(inputStream);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 17:48:15 UTC (rev 28139)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 17:55:11 UTC (rev 28140)
@@ -56,7 +56,7 @@
Node addressNode = addressList.item(i);
if (addressNode != null) {
String address = stripText(addressNode.getTextContent());
- if (address != null) {
+ if (address != null && address.length() > 0) {
addresses.add(address);
}
}
13 years, 10 months
JBoss Tools SVN: r28139 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-12 12:48:15 -0500 (Wed, 12 Jan 2011)
New Revision: 28139
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java
Log:
added string-stripping (to remove \n,\t, " ", etc.)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:46:06 UTC (rev 28138)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:48:15 UTC (rev 28139)
@@ -14,8 +14,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.text.MessageFormat;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,13 +28,11 @@
/**
* @author André Dietisheim
- *
+ *
* @param <DELTACLOUDOBJECT>
*/
public abstract class AbstractDOMUnmarshaller<DELTACLOUDOBJECT> {
- private Pattern STRIP_REGEXP = Pattern.compile("[^\n \t]+");
-
private Class<DELTACLOUDOBJECT> type;
private String tagName;
@@ -45,7 +41,8 @@
this.tagName = tagName;
}
- public DELTACLOUDOBJECT unmarshall(InputStream inputStream, DELTACLOUDOBJECT deltacloudObject) throws DeltaCloudClientException {
+ public DELTACLOUDOBJECT unmarshall(InputStream inputStream, DELTACLOUDOBJECT deltacloudObject)
+ throws DeltaCloudClientException {
try {
Element element = getFirstElement(tagName, getDocument(inputStream));
if (element == null) {
@@ -60,7 +57,8 @@
}
- protected Document getDocument(InputStream inputStream) throws ParserConfigurationException, SAXException, IOException {
+ protected Document getDocument(InputStream inputStream) throws ParserConfigurationException, SAXException,
+ IOException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder documentBuilder = factory.newDocumentBuilder();
return documentBuilder.parse(inputStream);
@@ -124,11 +122,7 @@
if (textContent == null || textContent.length() == 0) {
return textContent;
}
- Matcher matcher = STRIP_REGEXP.matcher(textContent);
- if (!matcher.matches()) {
- return null;
- }
- return matcher.group();
+ return textContent.trim();
}
}
13 years, 10 months
JBoss Tools SVN: r28138 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client: utils and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-12 12:46:06 -0500 (Wed, 12 Jan 2011)
New Revision: 28138
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java
Log:
added string-stripping (to remove \n,\t, " ", etc.)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:22:45 UTC (rev 28137)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-12 17:46:06 UTC (rev 28138)
@@ -14,6 +14,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.text.MessageFormat;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -33,6 +35,8 @@
*/
public abstract class AbstractDOMUnmarshaller<DELTACLOUDOBJECT> {
+ private Pattern STRIP_REGEXP = Pattern.compile("[^\n \t]+");
+
private Class<DELTACLOUDOBJECT> type;
private String tagName;
@@ -116,4 +120,15 @@
return null;
}
+ protected String stripText(String textContent) {
+ if (textContent == null || textContent.length() == 0) {
+ return textContent;
+ }
+ Matcher matcher = STRIP_REGEXP.matcher(textContent);
+ if (!matcher.matches()) {
+ return null;
+ }
+ return matcher.group();
+ }
+
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 17:22:45 UTC (rev 28137)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-12 17:46:06 UTC (rev 28138)
@@ -55,7 +55,10 @@
for (int i = 0; i < addressList.getLength(); i++) {
Node addressNode = addressList.item(i);
if (addressNode != null) {
- addresses.add(addressNode.getTextContent());
+ String address = stripText(addressNode.getTextContent());
+ if (address != null) {
+ addresses.add(address);
+ }
}
}
return new AddressList(addresses);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 17:22:45 UTC (rev 28137)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 17:46:06 UTC (rev 28138)
@@ -94,7 +94,7 @@
public static String toString(InputStream inputStream) throws IOException {
StringBuilder builder = new StringBuilder();
for(int character = -1; (character = inputStream.read()) != -1; ) {
- builder.append(character);
+ builder.append((char) character);
}
return builder.toString();
}
13 years, 10 months
JBoss Tools SVN: r28137 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-12 12:22:45 -0500 (Wed, 12 Jan 2011)
New Revision: 28137
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
Log:
removed annoying and unused sysout, added check for monitor.isCanceled()
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-01-12 17:21:35 UTC (rev 28136)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-01-12 17:22:45 UTC (rev 28137)
@@ -108,13 +108,12 @@
monitor.setTaskName("Connecting to remote server");
IStatus status = null;
int count = 0;
- while( status == null && count < timeout) {
+ while( status == null && count < timeout && !monitor.isCanceled()) {
try {
status = connect(service, monitor);
monitor.done();
return status;
} catch(Exception e) {
- System.out.println("Exception " + e.getMessage() + " at timeout " + count);
count += 1000;
monitor.worked(1000);
try {
13 years, 10 months
JBoss Tools SVN: r28136 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-01-12 12:21:35 -0500 (Wed, 12 Jan 2011)
New Revision: 28136
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
Log:
For Green Build. Removed wrong reference to ESB component in facelet meta data.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2011-01-12 17:00:25 UTC (rev 28135)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2011-01-12 17:21:35 UTC (rev 28136)
@@ -822,7 +822,7 @@
HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler"
ICON="action.empty" PROPERTIES="validator.edit=true"
WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename">
- <EntityData EntityName="FileESB110">
+ <EntityData EntityName="FacesConfig">
<AttributeData AttributeName="name"/>
</EntityData>
</XActionItem>
13 years, 10 months
JBoss Tools SVN: r28135 - branches.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-12 12:00:25 -0500 (Wed, 12 Jan 2011)
New Revision: 28135
Added:
branches/jbosstools-3.2.0.CR1/
Log:
branch for CR1
Copied: branches/jbosstools-3.2.0.CR1 (from rev 28134, trunk)
13 years, 10 months
JBoss Tools SVN: r28134 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-12 11:10:56 -0500 (Wed, 12 Jan 2011)
New Revision: 28134
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java
Log:
removed debug output
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java 2011-01-12 16:07:48 UTC (rev 28133)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java 2011-01-12 16:10:56 UTC (rev 28134)
@@ -107,10 +107,8 @@
public void setSelectedKey() {
DeltaCloudKey key = getSelectedKey();
if (key == null) {
- System.err.println("selected key = 0");
setSelectedKey(0);
} else {
- System.err.println("selected key = " + key);
setSelectedKey(key);
}
}
13 years, 10 months