JBoss Tools SVN: r26707 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-18 09:22:24 -0500 (Thu, 18 Nov 2010)
New Revision: 26707
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeltaCloudRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
[JBIDE-7625] corrected autentication realm to always use the url that is used to request (no mix of IP and hostname any more)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-18 14:10:06 UTC (rev 26706)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-18 14:22:24 UTC (rev 26707)
@@ -1,5 +1,14 @@
2010-11-18 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/core/client/request/DeltaCloudRequest.java (getUrl):
+ * src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java (getUrl):
+ [JBIDE-7593] need to return URL (not String)
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
+ (addCredentials):
+ [JBIDE-7593] need to use URL (not String)
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
+ (sendRequest):
+ [JBIDE-7593] need to add credentials using the url that is effectively used in the request (which may be either the baseURL or the url in the action)
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud):
[JBIDE-7625] store password in the constructor
(editCloud):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-11-18 14:10:06 UTC (rev 26706)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-11-18 14:22:24 UTC (rev 26707)
@@ -20,6 +20,7 @@
import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.UnknownHostException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
@@ -52,8 +53,8 @@
import org.jboss.tools.deltacloud.core.client.request.DeltaCloudRequest;
import org.jboss.tools.deltacloud.core.client.request.DeltaCloudRequest.HttpMethod;
import org.jboss.tools.deltacloud.core.client.request.ListHardwareProfileRequest;
+import org.jboss.tools.deltacloud.core.client.request.ListHardwareProfilesRequest;
import org.jboss.tools.deltacloud.core.client.request.ListImageRequest;
-import org.jboss.tools.deltacloud.core.client.request.ListHardwareProfilesRequest;
import org.jboss.tools.deltacloud.core.client.request.ListImagesRequest;
import org.jboss.tools.deltacloud.core.client.request.ListInstanceRequest;
import org.jboss.tools.deltacloud.core.client.request.ListInstancesRequest;
@@ -99,10 +100,11 @@
}
protected String sendRequest(DeltaCloudRequest deltaCloudRequest) throws DeltaCloudClientException {
- DefaultHttpClient httpClient = addCredentials(new DefaultHttpClient());
- logger.debug("Sending Request to: " + deltaCloudRequest.getUrl());
-
+ DefaultHttpClient httpClient = new DefaultHttpClient();
try {
+ URL url = deltaCloudRequest.getUrl();
+ addCredentials(url, httpClient, username, password);
+ logger.debug("Sending Request to: " + url);
HttpUriRequest request = createRequest(deltaCloudRequest);
HttpResponse httpResponse = httpClient.execute(request);
throwOnHttpErrors(deltaCloudRequest.getUrl(), httpResponse);
@@ -118,7 +120,7 @@
}
}
- private void throwOnHttpErrors(String requestUrl, HttpResponse httpResponse) throws DeltaCloudClientException {
+ private void throwOnHttpErrors(URL requestUrl, HttpResponse httpResponse) throws DeltaCloudClientException {
int statusCode = httpResponse.getStatusLine().getStatusCode();
if (HttpStatusCode.OK.isStatus(statusCode)) {
return;
@@ -155,10 +157,11 @@
* @param requestUrl
* the requested url
* @return the request instance
+ * @throws MalformedURLException
*/
- protected HttpUriRequest createRequest(DeltaCloudRequest deltaCloudRequest) {
+ protected HttpUriRequest createRequest(DeltaCloudRequest deltaCloudRequest) throws MalformedURLException {
HttpUriRequest request = null;
- String url = deltaCloudRequest.getUrl();
+ String url = deltaCloudRequest.getUrl().toString();
HttpMethod httpMethod = deltaCloudRequest.getHttpMethod();
switch (httpMethod) {
case POST:
@@ -181,11 +184,12 @@
* @param httpClient
* the http client
* @return the default http client
+ * @throws UnknownHostException
*/
- private DefaultHttpClient addCredentials(DefaultHttpClient httpClient) {
+ private DefaultHttpClient addCredentials(URL url, DefaultHttpClient httpClient, String username, String password) throws UnknownHostException {
if (username != null && password != null) {
httpClient.getCredentialsProvider().setCredentials(
- new AuthScope(baseUrl.getHost(), baseUrl.getPort()),
+ new AuthScope(url.getHost(), url.getPort()),
new UsernamePasswordCredentials(username, password));
}
return httpClient;
@@ -612,8 +616,8 @@
public boolean performInstanceAction(InstanceAction action) throws DeltaCloudClientException {
if (action != null) {
try {
- String response = sendRequest(new PerformInstanceActionRequest(
- new URL(action.getUrl()),
+ String response = sendRequest(
+ new PerformInstanceActionRequest(new URL(action.getUrl()),
action.getMethod()));
if (!InstanceAction.DESTROY.equals(action.getName())) {
updateInstance(response, action.getInstance());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java 2010-11-18 14:10:06 UTC (rev 26706)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java 2010-11-18 14:22:24 UTC (rev 26707)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
+import java.net.MalformedURLException;
import java.net.URL;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
@@ -17,7 +18,7 @@
public abstract class AbstractDeltaCloudRequest implements DeltaCloudRequest {
- private String url;
+ private URL url;
private HttpMethod httpMethod;
private UrlBuilder urlBuilder;
@@ -32,9 +33,9 @@
return new UrlBuilder(baseURL).path(API_PATH_SEGMENT);
}
- public String getUrl() {
+ public URL getUrl() throws MalformedURLException {
if (url == null) {
- this.url = doCreateUrl(urlBuilder);
+ this.url = new URL(doCreateUrl(urlBuilder));
}
return url;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeltaCloudRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeltaCloudRequest.java 2010-11-18 14:10:06 UTC (rev 26706)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeltaCloudRequest.java 2010-11-18 14:22:24 UTC (rev 26707)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
+import java.net.MalformedURLException;
+import java.net.URL;
+
public interface DeltaCloudRequest {
public static final char PATH_SEPARATOR = '/';
@@ -20,7 +23,7 @@
GET, POST, PUT, DELETE, HEAD;
}
- public String getUrl();
+ public URL getUrl() throws MalformedURLException;
public HttpMethod getHttpMethod();
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-18 14:10:06 UTC (rev 26706)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-18 14:22:24 UTC (rev 26707)
@@ -80,6 +80,10 @@
@Override
public void modifyText(ModifyEvent e) {
int index = cloudSelector.getSelectionIndex();
+ if (index < 0) {
+ return;
+ }
+
if (currCloud != null) {
currCloud.removeInstanceListListener(parentView);
}
@@ -311,7 +315,9 @@
public void listChanged(DeltaCloud cloud, final DeltaCloudInstance[] instances) {
// Run following under Display thread since this can be
// triggered by a non-display thread notifying listeners.
- if (cloud.getName().equals(currCloud.getName())) {
+ if (cloud != null
+ && currCloud != null
+ && cloud.getName().equals(currCloud.getName())) {
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26706 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-18 09:10:06 -0500 (Thu, 18 Nov 2010)
New Revision: 26706
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
JBIDE-7616
https://jira.jboss.org/browse/JBIDE-7616
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java 2010-11-18 12:26:50 UTC (rev 26705)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamContextShortVariable.java 2010-11-18 14:10:06 UTC (rev 26706)
@@ -7,17 +7,26 @@
public class SeamContextShortVariable extends SeamObject implements ISeamContextShortVariable {
ISeamContextVariable original;
+ String prefix = null;
public SeamContextShortVariable(ISeamContextVariable original) {
this.original = original;
}
+ public SeamContextShortVariable(ISeamContextVariable original, String prefix) {
+ this.original = original;
+ this.prefix = prefix;
+ }
+
public ISeamContextVariable getOriginal() {
return original;
}
public String getName() {
String n = original.getName();
+ if(prefix != null && n.startsWith(prefix)) {
+ return n.substring(prefix.length());
+ }
int i = n.lastIndexOf('.');
return n.substring(i + 1);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2010-11-18 12:26:50 UTC (rev 26705)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2010-11-18 14:10:06 UTC (rev 26706)
@@ -36,6 +36,7 @@
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.IRole;
import org.jboss.tools.seam.core.ISeamComponentMethod;
+import org.jboss.tools.seam.core.ISeamContextShortVariable;
import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
@@ -68,29 +69,31 @@
public Set<ISeamContextVariable> getVariablesByName(String name) {
Set<ISeamContextVariable> result = new HashSet<ISeamContextVariable>();
for (String s: imports) {
- String qname = s + "." + name;
- Set<ISeamContextVariable> c = getSeamProject().getVariablesByName(qname);
- if((c == null || c.isEmpty()) && getSeamProject().getParentProject() != null) c = getSeamProject().getParentProject().getVariablesByName(qname);
- if(c != null && !c.isEmpty()) {
- result.addAll(c);
- for (ISeamContextVariable v: c) {
- result.add(new SeamContextShortVariable(v));
- }
- }
+ lookUpForVariable(s, name, result);
}
if(result.isEmpty()) {
List<SeamImport> is = ((SeamProject)getSeamProject()).getPackageImports(this);
if(is != null && !is.isEmpty()) {
for (SeamImport i: is) {
- String qname = i.getSeamPackage() + "." + name;
- Set<ISeamContextVariable> c = getSeamProject().getVariablesByName(qname);
- if((c == null || c.isEmpty()) && getSeamProject().getParentProject() != null) c = getSeamProject().getParentProject().getVariablesByName(qname);
- if(c != null && !c.isEmpty()) result.addAll(c);
+ lookUpForVariable(i.getSeamPackage(), name, result);
}
}
}
return result;
}
+
+ private void lookUpForVariable(String importname, String name, Set<ISeamContextVariable> result) {
+ String qname = importname + "." + name;
+ Set<ISeamContextVariable> c = getSeamProject().getVariablesByName(qname);
+ if((c == null || c.isEmpty()) && getSeamProject().getParentProject() != null) c = getSeamProject().getParentProject().getVariablesByName(qname);
+ if(c != null && !c.isEmpty()) {
+ result.addAll(c);
+ for (ISeamContextVariable v: c) {
+ if(v instanceof ISeamContextShortVariable) continue;
+ result.add(new SeamContextShortVariable(v, importname + "."));
+ }
+ }
+ }
public void setType(IType type) {
this.type = type;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-11-18 12:26:50 UTC (rev 26705)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-11-18 14:10:06 UTC (rev 26706)
@@ -1438,7 +1438,7 @@
Set<ISeamContextVariable> result = getVariables(true);
Set<String> imports = new HashSet<String>();
if(context != null) {
- imports = ((SeamJavaComponentDeclaration)context).getImports();
+ imports.addAll(((SeamJavaComponentDeclaration)context).getImports());
List<SeamImport> is = getPackageImports(context);
if(is != null) {
for (SeamImport i: is) imports.add(i.getSeamPackage());
@@ -1452,8 +1452,7 @@
if(v instanceof ISeamContextShortVariable) continue;
for (String q: imports) {
if(v.getName().startsWith(q + ".")) {
- result.add(new SeamContextShortVariable(v));
- break;
+ result.add(new SeamContextShortVariable(v, q + "."));
}
}
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26705 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-18 07:26:50 -0500 (Thu, 18 Nov 2010)
New Revision: 26705
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java
Log:
JBIDE-7616
https://jira.jboss.org/browse/JBIDE-7616
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2010-11-18 12:23:57 UTC (rev 26704)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2010-11-18 12:26:50 UTC (rev 26705)
@@ -405,7 +405,7 @@
if (propertyName == null)
return null;
- ScopeType scope = SeamELCompletionEngine.getScope(seamProject, file);
+// ScopeType scope = SeamELCompletionEngine.getScope(seamProject, file);
ELInvocationExpression expr = (ELInvocationExpression)exp;
@@ -414,7 +414,7 @@
if (expr.getLeft() != null) {
while (left != null) {
List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = engine.resolveVariables(seamProject, scope, left,
+ resolvedVars = engine.resolveVariables(seamProject, file, left,
left == expr, true);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
map.put(left, resolvedVars);
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2010-11-18 12:23:57 UTC (rev 26704)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2010-11-18 12:26:50 UTC (rev 26705)
@@ -38,9 +38,11 @@
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
import org.jboss.tools.seam.core.ISeamContextShortVariable;
import org.jboss.tools.seam.core.ISeamContextVariable;
+import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
import org.jboss.tools.seam.text.ext.SeamExtPlugin;
@@ -133,7 +135,19 @@
if (nameToSearch == null && nameToSearch.trim().length() == 0)
continue;
- Set<ISeamContextVariable> vars = seamProject.getVariables(true);
+ ISeamJavaComponentDeclaration declaration = null;
+
+ if(file != null) {
+ Set<ISeamComponent> cs = seamProject.getComponentsByPath(file.getFullPath());
+ for (ISeamComponent c: cs) {
+ ISeamJavaComponentDeclaration d = c.getJavaDeclaration();
+ if(d != null && file.getFullPath().equals(d.getSourcePath()) && !((SeamJavaComponentDeclaration)d).getImports().isEmpty()) {
+ declaration = d;
+ }
+ }
+
+ }
+ Set<ISeamContextVariable> vars = seamProject.getVariables(declaration);
if (vars != null) {
for (ISeamContextVariable var : vars) {
if (nameToSearch.equals(var.getName())){
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2010-11-18 12:23:57 UTC (rev 26704)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2010-11-18 12:26:50 UTC (rev 26705)
@@ -172,7 +172,7 @@
if (propertyName == null)
return null;
- ScopeType scope = SeamELCompletionEngine.getScope(seamProject, file);
+// ScopeType scope = SeamELCompletionEngine.getScope(seamProject, file);
ELInvocationExpression expr = (ELInvocationExpression)exp;
@@ -181,7 +181,7 @@
if (expr.getLeft() != null) {
while (left != null) {
List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = engine.resolveVariables(seamProject, scope, left,
+ resolvedVars = engine.resolveVariables(seamProject, file, left,
left == expr, true);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
map.put(left, resolvedVars);
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26704 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-18 07:23:57 -0500 (Thu, 18 Nov 2010)
New Revision: 26704
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
Log:
JBIDE-7616
https://jira.jboss.org/browse/JBIDE-7616
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2010-11-18 11:41:54 UTC (rev 26703)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2010-11-18 12:23:57 UTC (rev 26704)
@@ -167,11 +167,21 @@
/**
* Adds references to variables that provide short name if
- * seam package including the original variable is imported.
+ * seam package including the original variable is imported by components.xml.
* @return all seam context variables of project
*/
public Set<ISeamContextVariable> getVariables(boolean includeShortNames);
+ /**
+ * Adds references to variables that provide short name if
+ * seam package including the original variable is imported
+ * 1) by components.xml;
+ * 2) by Java type presented by context;
+ * 3) by Java package that contains Java type presented by context.
+ * @return all seam context variables of project
+ */
+ public Set<ISeamContextVariable> getVariables(ISeamJavaComponentDeclaration context);
+
public void addVariable(ISeamContextVariable v);
public void removeVariable(ISeamContextVariable v);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2010-11-18 11:41:54 UTC (rev 26703)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2010-11-18 12:23:57 UTC (rev 26704)
@@ -71,7 +71,12 @@
String qname = s + "." + name;
Set<ISeamContextVariable> c = getSeamProject().getVariablesByName(qname);
if((c == null || c.isEmpty()) && getSeamProject().getParentProject() != null) c = getSeamProject().getParentProject().getVariablesByName(qname);
- if(c != null && !c.isEmpty()) result.addAll(c);
+ if(c != null && !c.isEmpty()) {
+ result.addAll(c);
+ for (ISeamContextVariable v: c) {
+ result.add(new SeamContextShortVariable(v));
+ }
+ }
}
if(result.isEmpty()) {
List<SeamImport> is = ((SeamProject)getSeamProject()).getPackageImports(this);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-11-18 11:41:54 UTC (rev 26703)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2010-11-18 12:23:57 UTC (rev 26704)
@@ -45,6 +45,7 @@
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
+import org.jboss.tools.seam.core.ISeamContextShortVariable;
import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamFactory;
import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
@@ -1432,7 +1433,35 @@
return variables.getVariablesPlusShort();
}
}
-
+
+ public Set<ISeamContextVariable> getVariables(ISeamJavaComponentDeclaration context) {
+ Set<ISeamContextVariable> result = getVariables(true);
+ Set<String> imports = new HashSet<String>();
+ if(context != null) {
+ imports = ((SeamJavaComponentDeclaration)context).getImports();
+ List<SeamImport> is = getPackageImports(context);
+ if(is != null) {
+ for (SeamImport i: is) imports.add(i.getSeamPackage());
+ }
+ }
+ if(!imports.isEmpty()) {
+ Set<ISeamContextVariable> vs = result;
+ result = new HashSet<ISeamContextVariable>();
+ result.addAll(vs);
+ for (ISeamContextVariable v: vs) {
+ if(v instanceof ISeamContextShortVariable) continue;
+ for (String q: imports) {
+ if(v.getName().startsWith(q + ".")) {
+ result.add(new SeamContextShortVariable(v));
+ break;
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
public boolean isImportedPackage(String packageName) {
for (IPath s: imports.importsBySource.keySet()) {
List<SeamImport> list = imports.importsBySource.get(s);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2010-11-18 11:41:54 UTC (rev 26703)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2010-11-18 12:23:57 UTC (rev 26704)
@@ -123,14 +123,14 @@
ELInvocationExpression left = expr;
- ScopeType scope = getScope(project, file);
+// ScopeType scope = getScope(project, file);
if (expr.getLeft() == null && isIncomplete) {
- resolvedVariables = resolveVariables(project, scope, expr, true, true);
+ resolvedVariables = resolveVariables(project, file, expr, true, true);
} else {
while (left != null) {
List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = resolveVariables(project, scope, left,
+ resolvedVars = resolveVariables(project, file, left,
left == expr, true);
if (resolvedVars != null && !resolvedVars.isEmpty()) {
resolvedVariables = resolvedVars;
@@ -150,8 +150,8 @@
@Override
public List<ISeamContextVariable> resolveVariables(IFile file, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) {
ISeamProject project = SeamCorePlugin.getSeamProject(file.getProject(), true);
- ScopeType scope = getScope(project, file);
- return resolveVariables(project, scope, expr, isFinal, onlyEqualNames);
+// ScopeType scope = getScope(project, file);
+ return resolveVariables(project, file, expr, isFinal, onlyEqualNames);
}
protected TypeInfoCollector.MemberInfo getMemberInfoByVariable(ISeamContextVariable var, boolean onlyEqualNames) {
@@ -238,7 +238,7 @@
return null;
}
- public List<ISeamContextVariable> resolveVariables(ISeamProject project, ScopeType scope, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) {
+ public List<ISeamContextVariable> resolveVariables(ISeamProject project, IFile file, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) {
List<ISeamContextVariable>resolvedVars = new ArrayList<ISeamContextVariable>();
if (project == null)
@@ -247,7 +247,7 @@
String varName = expr.toString();
if (varName != null) {
- resolvedVars = SeamExpressionResolver.resolveVariables(project, scope, varName, onlyEqualNames);
+ resolvedVars = SeamExpressionResolver.resolveVariables(project, file, varName, onlyEqualNames);
}
if (resolvedVars != null && !resolvedVars.isEmpty()) {
List<ISeamContextVariable> newResolvedVars = new ArrayList<ISeamContextVariable>();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2010-11-18 11:41:54 UTC (rev 26703)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2010-11-18 12:23:57 UTC (rev 26704)
@@ -13,9 +13,11 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
@@ -52,6 +54,7 @@
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamComponentMethodType;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration;
/**
* Utility class used to resolve Seam project variables and to get the methods/properties and their presentation strings from type
@@ -68,19 +71,32 @@
* @param name
* @return
*/
- public static List<ISeamContextVariable> resolveVariables(ISeamProject project, ScopeType scope, String name, boolean onlyEqualNames) {
+ public static List<ISeamContextVariable> resolveVariables(ISeamProject project, IFile context, String name, boolean onlyEqualNames) {
if (project == null || name == null) return null;
ISeamProject parent = project.getParentProject();
if(parent != null) {
project = parent;
}
+
+ ISeamJavaComponentDeclaration declaration = null;
+
+ if(context != null) {
+ Set<ISeamComponent> cs = project.getComponentsByPath(context.getFullPath());
+ for (ISeamComponent c: cs) {
+ ISeamJavaComponentDeclaration d = c.getJavaDeclaration();
+ if(d != null && context.getFullPath().equals(d.getSourcePath())) {
+ declaration = d;
+ }
+ }
+
+ }
/*
* JBIDE-670 scope isn't used anymore
*/
// return (scope == null ? internalResolveVariables(project, name, onlyEqualNames) :
// internalResolveVariablesByScope(project, scope, name, onlyEqualNames));
- return internalResolveVariables(project, name, onlyEqualNames);
+ return internalResolveVariables(project, declaration, name, onlyEqualNames);
}
/**
@@ -91,15 +107,21 @@
* @param name
* @return
*/
- private static List<ISeamContextVariable> internalResolveVariables(ISeamProject project, String name, boolean onlyEqualNames) {
- Set<ISeamContextVariable> variables = project.getVariables(true);
- return internalResolveVariables(project, name, onlyEqualNames, variables);
+ private static List<ISeamContextVariable> internalResolveVariables(ISeamProject project, ISeamJavaComponentDeclaration context, String name, boolean onlyEqualNames) {
+ //TODO add variables from imported packages
+ Set<ISeamContextVariable> variables = project.getVariables(context);
+ return internalResolveVariables(project, context, name, onlyEqualNames, variables);
}
- private static List<ISeamContextVariable> internalResolveVariables(ISeamProject project, String name, boolean onlyEqualNames, Set<ISeamContextVariable> variables) {
+ private static List<ISeamContextVariable> internalResolveVariables(ISeamProject project, ISeamJavaComponentDeclaration context, String name, boolean onlyEqualNames, Set<ISeamContextVariable> variables) {
List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>();
if(onlyEqualNames) {
- variables = project.getVariablesByName(name);
+ if(context != null) {
+ variables = context.getVariablesByName(name);
+ } else variables = new HashSet<ISeamContextVariable>();
+ if(variables.isEmpty()) {
+ variables = project.getVariablesByName(name);
+ }
if(variables != null) resolvedVariables.addAll(variables);
return resolvedVariables;
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26703 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-18 06:41:54 -0500 (Thu, 18 Nov 2010)
New Revision: 26703
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Log:
[JBIDE-7625] [JBIDE-7627] create new client when cloud was edited, reinitialize list of clouds when loading clouds (and not add loaded ones to the existing ones, etc.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-18 11:41:54 UTC (rev 26703)
@@ -1,3 +1,14 @@
+2010-11-18 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud):
+ [JBIDE-7625] store password in the constructor
+ (editCloud):
+ [JBIDE-7625] have to create new client when cloud was edited
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (removeCloud):
+ [JBIDE-7625] removed check for pw on identical url any more since we now save the pw with the name of the cloud
+ (loadCloud):
+ [JBIDE-7627] reinitialize cloud list when loading clouds (otherwise clouds loaded will simply get added to the existing ones)
+
2010-11-17 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-18 11:41:54 UTC (rev 26703)
@@ -43,12 +43,11 @@
private String name;
private String username;
- private String password;
private String url;
private String type;
private String lastKeyname = "";
private String lastImageId = "";
- private DeltaCloudClientImpl client;
+ private InternalDeltaCloudClient client;
private ArrayList<DeltaCloudInstance> instances;
private ArrayList<DeltaCloudImage> images;
private IImageFilter imageFilter;
@@ -65,25 +64,27 @@
public boolean matchesState(DeltaCloudInstance instance, String instanceState);
}
- public DeltaCloud(String name, String url, String username, String passwd) {
+ public DeltaCloud(String name, String url, String username, String passwd) throws DeltaCloudException {
this(name, url, username, passwd, null);
}
- public DeltaCloud(String name, String url, String username, String password, String type) {
+ public DeltaCloud(String name, String url, String username, String password, String type) throws DeltaCloudException {
this(name, url, username, password, type, IImageFilter.ALL_STRING, IInstanceFilter.ALL_STRING);
}
public DeltaCloud(String name, String url, String username, String type, String imageFilterRules,
- String instanceFilterRules) {
+ String instanceFilterRules) throws DeltaCloudException {
this(name, url, username, null, type, imageFilterRules, instanceFilterRules);
}
- public DeltaCloud(String name, String url, String username, String passwd,
- String type, String imageFilterRules, String instanceFilterRules) {
+ public DeltaCloud(String name, String url, String username, String password,
+ String type, String imageFilterRules, String instanceFilterRules) throws DeltaCloudException {
this.url = url;
this.name = name;
this.username = username;
this.type = type;
+ storePassword(name, username, password);
+ this.client = createClient(name, url, username, password);
imageFilter = createImageFilter(imageFilterRules);
instanceFilter = createInstanceFilter(instanceFilterRules);
}
@@ -93,19 +94,19 @@
this.url = url;
this.name = name;
this.username = username;
- this.password = password;
this.type = type;
- storePassword(url, username, password);
- // save();
+ removePassword(name, username);
+ storePassword(name, username, password);
+ client = createClient(name, url, username, password);
loadChildren();
}
- private InternalDeltaCloudClient getClient() throws DeltaCloudException {
+ private InternalDeltaCloudClient createClient(String name, String url, String username, String password) throws DeltaCloudException {
try {
- if (client == null) {
- this.client = new DeltaCloudClientImpl(url, username, getPassword(url, username));
+ if (password == null) {
+ password = getPasswordFromPreferences(name, username);
}
- return client;
+ return new DeltaCloudClientImpl(url, username, password);
} catch (MalformedURLException e) {
throw new DeltaCloudException(MessageFormat.format("Could not access cloud at {0}", url), e);
} catch (StorageException e) {
@@ -114,27 +115,18 @@
}
}
- private String getPassword(String url, String username) throws StorageException {
- if (password != null) {
- return password;
- } else {
- this.password = getPasswordFromPreferences(url, username);
- return this.password;
- }
- }
-
- private String getPasswordFromPreferences(String url, String username) throws StorageException {
- String key = DeltaCloud.getPreferencesKey(url, username); // $NON-NLS-1$
+ private String getPasswordFromPreferences(String cloudName, String username) throws StorageException {
+ String key = getPreferencesKey(cloudName, username); // $NON-NLS-1$
ISecurePreferences root = SecurePreferencesFactory.getDefault();
ISecurePreferences node = root.node(key);
String password = node.get("password", null); //$NON-NLS-1$
return password;
}
- private void storePassword(String url, String username, String passwd) throws DeltaCloudException {
+ private void storePassword(String cloudName, String username, String passwd) throws DeltaCloudException {
if (passwd != null) {
ISecurePreferences root = SecurePreferencesFactory.getDefault();
- String key = DeltaCloud.getPreferencesKey(url, username);
+ String key = getPreferencesKey(cloudName, username);
ISecurePreferences node = root.node(key);
try {
node.put("password", passwd, true /* encrypt */); //$NON-NLS-1$
@@ -145,9 +137,23 @@
}
}
- public static String getPreferencesKey(String url, String username) {
- String key = "/org/jboss/tools/deltacloud/core/"; //$NON-NLS-1$
- key += url + "/" + username; //$NON-NLS-1$
+ public void removePassword(String cloudName, String userName) throws DeltaCloudException {
+ String key = getPreferencesKey(cloudName, userName);
+ ISecurePreferences root = SecurePreferencesFactory.getDefault();
+ ISecurePreferences node = root.node(key);
+ if (node == null) {
+ throw new DeltaCloudException(MessageFormat.format(
+ "Could not remove password for cloud {0} from secure preferences store", cloudName));
+ }
+ node.clear();
+ }
+
+ public static String getPreferencesKey(String cloudName, String username) {
+ String key = new StringBuilder("/org/jboss/tools/deltacloud/core/") //$NON-NLS-1$
+ .append(cloudName)
+ .append('/') //$NON-NLS-1$
+ .append(username)
+ .toString();
return EncodingUtils.encodeSlashes(key);
}
@@ -290,7 +296,7 @@
imageListeners.remove(listener);
}
- public DeltaCloudImage[] notifyImageListListeners() {
+ public DeltaCloudImage[] notifyImageListeners() {
DeltaCloudImage[] images = cloneImagesArray();
notifyImageListListeners(images);
return images;
@@ -394,7 +400,7 @@
synchronized (instanceLock) {
clearInstances();
try {
- List<Instance> list = getClient().listInstances();
+ List<Instance> list = client.listInstances();
for (Iterator<Instance> i = list.iterator(); i.hasNext();) {
DeltaCloudInstance instance = new DeltaCloudInstance(this, i.next());
instances.add(instance);
@@ -440,7 +446,7 @@
public void createKey(String keyname, String keystoreLocation) throws DeltaCloudException {
try {
- getClient().createKey(keyname, keystoreLocation);
+ client.createKey(keyname, keystoreLocation);
} catch (DeltaCloudClientException e) {
throw new DeltaCloudException(e);
}
@@ -448,7 +454,7 @@
public void deleteKey(String keyname) throws DeltaCloudException {
try {
- getClient().deleteKey(keyname);
+ client.deleteKey(keyname);
} catch (DeltaCloudClientException e) {
throw new DeltaCloudException(e);
}
@@ -477,7 +483,7 @@
public DeltaCloudInstance refreshInstance(String instanceId) throws DeltaCloudException {
DeltaCloudInstance retVal = null;
try {
- Instance instance = getClient().listInstances(instanceId);
+ Instance instance = client.listInstances(instanceId);
retVal = new DeltaCloudInstance(this, instance);
for (int i = 0; i < instances.size(); ++i) {
DeltaCloudInstance inst = instances.get(i);
@@ -534,7 +540,7 @@
public DeltaCloudHardwareProfile[] getProfiles() throws DeltaCloudException {
ArrayList<DeltaCloudHardwareProfile> profiles = new ArrayList<DeltaCloudHardwareProfile>();
try {
- List<HardwareProfile> list = getClient().listProfiles();
+ List<HardwareProfile> list = client.listProfiles();
for (Iterator<HardwareProfile> i = list.iterator(); i.hasNext();) {
DeltaCloudHardwareProfile profile = new DeltaCloudHardwareProfile(i.next());
profiles.add(profile);
@@ -549,7 +555,7 @@
public DeltaCloudImage loadImage(String imageId) throws DeltaCloudException {
try {
- Image image = getClient().listImages(imageId);
+ Image image = client.listImages(imageId);
DeltaCloudImage deltaCloudImage = addImage(image);
return deltaCloudImage;
} catch (DeltaCloudClientException e) {
@@ -570,11 +576,11 @@
synchronized (imageLock) {
try {
clearImages();
- List<Image> list = getClient().listImages();
+ List<Image> list = client.listImages();
for (Iterator<Image> i = list.iterator(); i.hasNext();) {
addImage(i.next());
}
- return notifyImageListListeners();
+ return notifyImageListeners();
} catch (DeltaCloudClientException e) {
throw new DeltaCloudException(MessageFormat.format("Could not load images of cloud {0}: {1}",
getName(), e.getMessage()), e);
@@ -585,7 +591,7 @@
private void clearImages() {
synchronized (imageLock) {
images = new ArrayList<DeltaCloudImage>();
- notifyImageListListeners();
+ notifyImageListeners();
}
}
@@ -607,7 +613,7 @@
public DeltaCloudImage getImage(String imageId) {
DeltaCloudImage retVal = null;
try {
- Image image = getClient().listImages(imageId);
+ Image image = client.listImages(imageId);
retVal = new DeltaCloudImage(image, this);
} catch (Exception e) {
e.printStackTrace();
@@ -619,7 +625,7 @@
public boolean testConnection() throws DeltaCloudException {
String instanceId = "nonexistingInstance"; //$NON-NLS-1$
try {
- getClient().listInstances(instanceId);
+ client.listInstances(instanceId);
return true;
} catch (DeltaCloudNotFoundClientException e) {
return true;
@@ -633,7 +639,7 @@
public DeltaCloudRealm[] getRealms() throws DeltaCloudException {
ArrayList<DeltaCloudRealm> realms = new ArrayList<DeltaCloudRealm>();
try {
- List<Realm> list = getClient().listRealms();
+ List<Realm> list = client.listRealms();
for (Iterator<Realm> i = list.iterator(); i.hasNext();) {
DeltaCloudRealm realm = new DeltaCloudRealm(i.next());
realms.add(realm);
@@ -649,9 +655,9 @@
try {
Instance instance = null;
if (keyname != null) {
- instance = getClient().createInstance(imageId, profileId, realmId, name, keyname, memory, storage);
+ instance = client.createInstance(imageId, profileId, realmId, name, keyname, memory, storage);
} else {
- instance = getClient().createInstance(imageId, profileId, realmId, name, memory, storage);
+ instance = client.createInstance(imageId, profileId, realmId, name, memory, storage);
}
if (instance != null) {
DeltaCloudInstance newInstance = new DeltaCloudInstance(this, instance);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-18 11:41:54 UTC (rev 26703)
@@ -13,10 +13,10 @@
import java.util.List;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl;
import org.jboss.tools.deltacloud.core.client.Instance;
import org.jboss.tools.deltacloud.core.client.Instance.State;
import org.jboss.tools.deltacloud.core.client.InstanceAction;
+import org.jboss.tools.deltacloud.core.client.InternalDeltaCloudClient;
public class DeltaCloudInstance {
@@ -120,7 +120,7 @@
return cloud;
}
- protected boolean performInstanceAction(String actionId, DeltaCloudClientImpl client)
+ protected boolean performInstanceAction(String actionId, InternalDeltaCloudClient client)
throws DeltaCloudClientException {
InstanceAction action = instance.getAction(actionId);
if (action == null) {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-18 11:41:54 UTC (rev 26703)
@@ -17,14 +17,13 @@
import java.io.PrintWriter;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.equinox.security.storage.ISecurePreferences;
-import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -36,13 +35,14 @@
private static final DeltaCloudManager INSTANCE = new DeltaCloudManager();
public final static String CLOUDFILE_NAME = "clouds.xml"; //$NON-NLS-1$
- private ArrayList<DeltaCloud> clouds = new ArrayList<DeltaCloud>();
+ private List<DeltaCloud> clouds = new ArrayList<DeltaCloud>();
private ListenerList cloudManagerListeners;
private DeltaCloudManager() {
}
public void loadClouds() throws DeltaCloudException {
+ clouds = new ArrayList<DeltaCloud>(); // clear present clouds
DeltaCloudMultiException connectionException = new DeltaCloudMultiException("Errors occurred while loading clouds from the preferences");
IPath stateLocation = Activator.getDefault().getStateLocation();
File cloudFile = stateLocation.append(CLOUDFILE_NAME).toFile();
@@ -182,43 +182,13 @@
notifyListeners(ICloudManagerListener.ADD_EVENT);
}
- public void removeCloud(DeltaCloud d) {
+ public void removeCloud(DeltaCloud d) throws DeltaCloudException {
clouds.remove(d);
- String url = d.getURL();
- String userName = d.getUsername();
- // check if we have a duplicate cloud connection using the same
- // url/username combo.
- // if we have removed a cloud and no other cloud shares the
- // url/username combo, then we should clear the node out which
- // includes the password.
- if (!isHasAnyCloud(url, userName)) {
- ISecurePreferences root = SecurePreferencesFactory.getDefault();
- String key = DeltaCloud.getPreferencesKey(url, userName);
- ISecurePreferences node = root.node(key);
- node.clear();
- }
+ d.removePassword(d.getName(), d.getName());
saveClouds();
notifyListeners(ICloudManagerListener.REMOVE_EVENT);
}
- /**
- * Checks if any cloud uses the given url and username
- *
- * @param url
- * the url
- * @param userName
- * the user name
- * @return true, if is checks for any cloud
- */
- private boolean isHasAnyCloud(String url, String userName) {
- for (DeltaCloud cloud : clouds) {
- if (cloud.getURL().equals(url) && cloud.getUsername().equals(userName)) {
- return true;
- }
- }
- return false;
- }
-
public void notifyCloudRename() {
saveClouds();
notifyListeners(ICloudManagerListener.RENAME_EVENT);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-18 11:41:54 UTC (rev 26703)
@@ -1,3 +1,10 @@
+2010-11-18 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java (execute):
+ [JBIDE-7625] added error reporting
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java (performTest):
+ [JBIDE-7625] corrected where name is fetched (was UI, should be model)
+
2010-11-17 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java (removeWithDialog):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-18 11:41:54 UTC (rev 26703)
@@ -13,7 +13,7 @@
<booleanAttribute key="default" value="false"/>
<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/>
<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-deltacloud"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.tm.terminal@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.core.resources@default:default,org.eclipse.rse@default:default,org.junit4@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui@default:default,javax.xml.rpc@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.compare@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.cdt.core@default:default,org.eclipse.emf.edit@default:default,org.apache.commons.el@default:default,org.apache.xml.resolver@defaul!
t:default,org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.jmx.ui@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,javax.wsdl*1.6.2.v201005080631@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.wst.validation@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jdt.debug.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jface.databinding@default:default,org.apache.xerces@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.equinox.p2.artifact.reposit!
ory@default:default,org.apache.commons.httpclient*3.1.0.v20100!
5080502@
default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.workbench@default:default,org.mortbay.jetty.util@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.eclipse.rse.doc.user@default:default,javax.activation@default:default,org.apache.axis@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.help.base@default:default,org.eclipse.equinox.frameworkadmin@default:default,com.jcraft.jsch@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.update.configurator@3:true,org.eclip!
se.core.filesystem@default:default,org.eclipse.update.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.rse.efs@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.app@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.dstore.core@default:default,org.eclipse.rse.efs.ui@default:default,javax.mail@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.rse.connectorservice.local@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.subsystems.files.dstore@default:default,org.eclips!
e.rse.subsystems.terminals.ssh@default:default,org.eclipse.cor!
e.variab
les@default:default,org.eclipse.text@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.rse.subsystems.files.ftp@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.rse.processes.ui@default:default,org.sat4j.pb@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.jasper@default:default,org.apache.lucene@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.rse.subsystems.terminals.core@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.pde.core@default:default,org.eclipse.jdt.compiler.apt@default!
:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.compare.core@default:default,org.eclipse.ui.views@default:default,org.mortbay.jetty.server@default:default,org.eclipse.osgi@-1:true,org.eclipse.jface.text@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.search@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.eclipse.rse.services@default:default,org.eclipse.rse.subsystems.processes.local@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.common.uriresolver@default:default,com.ibm.icu@default:default,org.eclipse.jsch.core@default:default,jav!
ax.xml.soap@default:default,org.eclipse.core.net.linux.x86_64@!
default:
false,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.cheatsheets@default:default,javax.xml@default:default,org.eclipse.ui.forms@default:default,org.uddi4j@default:default,org.eclipse.cdt.core.linux@default:false,org.eclipse.rse.connectorservice.dstore@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,javax.servlet@default:default,org.eclipse.jface@default:default,org.eclipse.debug.ui@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.ide@default:default,org.eclipse.rse.services.files.ftp@default:default,org.apache.commons.discovery@default:default,org.eclipse.osgi.util@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.junit@defau!
lt:default,org.eclipse.wst.sse.core@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.rse.terminals.ui@default:default,org.apache.ant@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.rse.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.xml.serializer@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.debug.cor!
e@default:default,org.eclipse.team.ui@default:default,org.ecli!
pse.ltk.
ui.refactoring@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.rse.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.help.ui@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.net@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.swt@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.ecf.provi!
der.filetransfer@default:default,org.eclipse.xsd@default:default,org.eclipse.ecf.identity@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jem.util@default:default,org.eclipse.sdk@default:default,org.eclipse.pde.build@default:default,org.eclipse.ui.browser@default:default,org.apache.lucene.analysis@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.help@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.jetty@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.rse.services.telnet@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.app@default:default,org.eclipse.rse.efs.ui@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,javax.xml@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.rse.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.rse.connectorservice.dstore@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.emf.common@default:default,org.eclipse.swtbot.ant.optional.ju!
nit4@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.pde.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.jem.util@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.dstore.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.cdt.core.linux@default:false,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.forms@default:default,org.ecl!
ipse.help@default:default,org.eclipse.core.filebuffers@default!
:default
,org.eclipse.team.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.help.base@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,com.ibm.icu@default:default,javax.servlet@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.rs!
e.services.ssh@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.net@default:default,javax.wsdl*1.6.2.v201005080631@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.common.core@default:default,javax.xml.rpc@default:default,org.eclipse.emf.ecore@default:default,org.sat4j.core@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.xsd@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.jdt@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.rse.subsystems.file!
s.ftp@default:default,org.eclipse.equinox.p2.jarprocessor@defa!
ult:defa
ult,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.update.configurator@3:true,org.apache.commons.net@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.team.core@default:default,org.eclipse.dstore.extra@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.jcraft.jsch@default:default,org.eclipse.ant.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.expressions@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.emf!
@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.p2.publisher@default:default,javax.activation@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.edit@default:default,org.eclipse.rse@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.pde.build@default:default,org.eclipse.compare@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.editors@default:default,org.eclipse.rse.subsystems.files.dstore@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rse.ui@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.jobs@default:default,org.apache.lucene@default:default,org.eclipse.emf.ecore.xmi@default:defau!
lt,org.eclipse.jface@default:default,org.eclipse.jdt.ui@defaul!
t:defaul
t,org.eclipse.ui.cheatsheets@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.ide.application@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.common@2:true,org.eclipse.rse.processes.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.rse.services@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.apache.commons.discovery@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ui.!
workbench.texteditor@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.update.core@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.rse.subsystems.processes.local@default:default,org.apache.axis@default:default,org.hamcrest.core@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.mail@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.xerces@default:default,org.eclipse.ecf.identity@default:default,org.sat4j.pb@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.junit4@default:default,org.eclipse.rse.connectorservice.ssh@defa!
ult:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:!
default,
org.eclipse.wst.common.uriresolver@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.browser@default:default,org.apache.xml.serializer@default:default,org.apache.xml.resolver@default:default,org.eclipse.cdt.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.ide@default:default,org.uddi4j@default:default,org.apache.jasper@default:default,org.eclipse.wst.sse.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.emf.common.ui@default:default,org.apache.ant@default:default,org.eclipse.rse.doc.user@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.rse.connectorservice.local@default:de!
fault,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.rse.efs@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ui.console@default:default,javax.xml.soap@default:default,org.eclipse.equinox.security.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-18 11:41:54 UTC (rev 26703)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.deltacloud.ui.commands;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -32,7 +33,9 @@
import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVCloudElement;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
import org.jboss.tools.deltacloud.ui.views.CloudViewElement;
@@ -80,7 +83,7 @@
setTitle(CVMessages.getString(CONFIRM_CLOUD_DELETE_TITLE));
}
}
-
+
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
@@ -88,17 +91,25 @@
if (selection instanceof IStructuredSelection) {
List<?> selectedElements = ((IStructuredSelection) selection).toList();
DeltaCloud deltaCloud = getFirstSelectedCloud(selectedElements);
- if (selectedElements.size() == 1 && deltaCloud != null) {
- removeDeltaCloud(deltaCloud);
- } else {
- removeWithDialog(shell, selectedElements);
+ try {
+ if (selectedElements != null
+ && selectedElements.size() == 1
+ && deltaCloud != null) {
+ removeDeltaCloud(deltaCloud);
+ } else {
+ removeWithDialog(shell, selectedElements);
+ }
+ } catch (DeltaCloudException e) {
+ // TODO internationalize strings
+ ErrorUtils.openErrorDialog("Error",
+ MessageFormat.format("Could not disconnect cloud {0}", deltaCloud.getName()), e, shell);
}
}
return Status.OK_STATUS;
}
- private void removeWithDialog(Shell shell, List<?> selectedElements) {
+ private void removeWithDialog(Shell shell, List<?> selectedElements) throws DeltaCloudException {
Collection<?> clouds = getSelectedClouds(selectedElements);
DisconnectCloudsDialog dialog = new DisconnectCloudsDialog(
shell
@@ -108,7 +119,7 @@
removeDeltaClouds(dialog.getResult());
}
}
-
+
private DeltaCloud getFirstSelectedCloud(List<?> selectedElements) {
DeltaCloud deltaCloud = null;
if (selectedElements.size() > 0) {
@@ -159,13 +170,13 @@
return getDeltaCloud((CloudViewElement) element.getParent());
}
- private void removeDeltaClouds(Object[] deltaClouds) {
+ private void removeDeltaClouds(Object[] deltaClouds) throws DeltaCloudException {
for (Object deltaCloud : deltaClouds) {
removeDeltaCloud((DeltaCloud) deltaCloud);
}
}
-
- private void removeDeltaCloud(DeltaCloud deltaCloud) {
+
+ private void removeDeltaCloud(DeltaCloud deltaCloud) throws DeltaCloudException {
DeltaCloudManager.getDefault().removeCloud((DeltaCloud) deltaCloud);
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-18 11:41:54 UTC (rev 26703)
@@ -88,10 +88,12 @@
try {
instances = filter(cloud.getCurrInstances());
} catch (Exception e) {
+ if (instances == null) {
+ instances = new DeltaCloudInstance[]{};
+ }
// TODO internationalize strings
ErrorUtils.openErrorDialog("Instance View Error", "Could not display instances for cloud " + cloud.getName(),
e, Display.getDefault().getActiveShell());
- instances = new DeltaCloudInstance[]{};
}
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2010-11-18 11:41:54 UTC (rev 26703)
@@ -105,8 +105,9 @@
String oldName = cloud.getName();
cloud.editCloud(name, url, username, password, type);
DeltaCloudManager.getDefault().saveClouds();
- if (!name.equals(oldName))
+ if (!name.equals(oldName)) {
DeltaCloudManager.getDefault().notifyCloudRename();
+ }
} catch (Exception e) {
}
return true;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-18 11:20:02 UTC (rev 26702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-18 11:41:54 UTC (rev 26703)
@@ -46,7 +46,7 @@
}
public boolean performTest() {
- String name = mainPage.getName();
+ String name = mainPage.getModel().getName();
String url = mainPage.getModel().getUrl();
String username = mainPage.getModel().getUsername();
String password = mainPage.getModel().getPassword();
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26702 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext: resources and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-11-18 06:20:02 -0500 (Thu, 18 Nov 2010)
New Revision: 26702
Removed:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/conf/
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties
Log:
bot ext: merged default db configuration samples
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2010-11-18 11:17:55 UTC (rev 26701)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2010-11-18 11:20:02 UTC (rev 26702)
@@ -9,3 +9,8 @@
SEAM=2.2,/data/jboss/jboss-eap-5.0/seam
#<esb versoin>,<esb runtime home>
ESB=4.7,/data/jboss/esb-4.7
+#DB Definition
+#DB=<db_type>,<version>,<driver_path>,<jdbc_string>,<username>,[<password>,<scriptpath>]
+#Supported types: hsqldb18, db2_97, mssql2005, mssql2008, mysql50, mysql51, oracle10g, oracle11gR1, oracle11gR1RAC, oracle11gR2, oracle11gR2RAC, postgresql82, postgresql83, postgresql84, sybase15
+#For internal: hsqldb18
+DB=hsqldb18,1.8,/home/user/lib/hsqldb/lib/hsqldb.jar,jdbc\:hsqldb\:hsql\://localhost\:8001/xdb,sa,,
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26701 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-11-18 06:17:55 -0500 (Thu, 18 Nov 2010)
New Revision: 26701
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java
Log:
bot ext: added bot-related assertions hepler class
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java 2010-11-18 11:17:55 UTC (rev 26701)
@@ -0,0 +1,29 @@
+package org.jboss.tools.ui.bot.ext;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+
+public class Assertions {
+ /**
+ * asserts that given items are contained in tree (deep down)
+ * @param tree tree container
+ * @param items list of items that must be contatined
+ */
+ public static void assertTreeContent(SWTBotTree tree, String... items) {
+ assertTrue("Editor tree does not contain expected path of nodes : "
+ + Arrays.toString(items),
+ SWTEclipseExt.containstInTree(tree, items));
+ }
+ /**
+ * asserts that given control is enabled/disabled
+ * @param control given control
+ * @param enabled state - true for enabled, false for disabled
+ */
+ public static void assertControlEnabled(AbstractSWTBot<?> control, boolean enabled) {
+ assertTrue(control.getClass().getSimpleName()+" "+control.getText()+ " is not in state: isEnabled()="+enabled,enabled == control.isEnabled());
+ }
+}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26700 - in trunk/as: tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-18 04:37:17 -0500 (Thu, 18 Nov 2010)
New Revision: 26700
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java
Log:
JBIDE-7626 - fix with test! =D
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-11-18 08:02:29 UTC (rev 26699)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-11-18 09:37:17 UTC (rev 26700)
@@ -171,6 +171,7 @@
if( !forceZip && !isBinaryObject) {
PublishCopyUtil util = new PublishCopyUtil(callback);
list.addAll(Arrays.asList(util.initFullPublish(members, ProgressMonitorUtil.submon(monitor, 700))));
+ JSTPublisherXMLToucher.getInstance().touch(deployPath, module, callback);
} else if( isBinaryObject )
list.addAll(Arrays.asList(copyBinaryModule(moduleTree, ProgressMonitorUtil.submon(monitor, 700))));
else {
@@ -182,11 +183,7 @@
File temp = deployRoot.toFile().createTempFile(module.getName(), ".tmp", deployRoot.toFile()); //$NON-NLS-1$
IPath tempFile = new Path(temp.getAbsolutePath());
list.addAll(Arrays.asList(PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1], tempFile)));
- String device = deployPath.getDevice();
- String root = "/"; //$NON-NLS-1$
- if (device != null) {
- root = device + root;
- }
+ String root = (deployPath.getDevice() == null ? "" : deployPath.getDevice()) + "/"; //$NON-NLS-1$//$NON-NLS-2$
IPublishCopyCallbackHandler handler = getCallbackHandler(new Path(root));
String parentFolder = deployPath.removeLastSegments(1).toString();
handler.makeDirectoryIfRequired(new Path(parentFolder), ProgressMonitorUtil.submon(monitor, 200));
Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2010-11-18 09:37:17 UTC (rev 26700)
@@ -0,0 +1,108 @@
+package org.jboss.ide.eclipse.as.test.publishing.v2;
+
+import java.io.File;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.ExtensionManager;
+import org.jboss.ide.eclipse.as.core.publishers.JstPublisher;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+import org.jboss.ide.eclipse.as.test.ASTest;
+import org.jboss.ide.eclipse.as.test.util.IOUtil;
+import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+import org.jboss.ide.eclipse.as.test.util.wtp.JavaEEFacetConstants;
+import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase;
+import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil;
+import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility;
+
+public class JSTDeploymentWarUpdateXML extends TestCase {
+
+ IProject project;
+ IServer server;
+ final String MODULE_NAME = "newModule";
+ final String CONTENT_DIR = "contentDirS";
+ final String TEXT_FILE = "test.txt";
+ final IPath CONTENT_TEXT_FILE = new Path(CONTENT_DIR).append(TEXT_FILE);
+ public void setUp() throws Exception {
+ project = createProject();
+ server = ServerRuntimeUtils.createMockDeployOnlyServer();
+ }
+
+ public void tearDown() throws Exception {
+ ServerRuntimeUtils.deleteAllServers();
+ ServerRuntimeUtils.deleteAllRuntimes();
+ ProjectUtility.deleteAllProjects();
+ ASTest.clearStateLocation();
+ }
+
+ protected IProject createProject() throws Exception {
+ IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, CONTENT_DIR, null, JavaEEFacetConstants.WEB_25, true);
+ OperationTestCase.runAndVerify(dm);
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME);
+ assertTrue(p.exists());
+ return p;
+ }
+
+ protected void verifyJSTPublisher(IModule[] module) {
+ IJBossServerPublisher publisher = ExtensionManager
+ .getDefault().getPublisher(server, module, "local");
+ assertTrue(publisher instanceof JstPublisher);
+ }
+
+ protected void assertContents(IFile file, int val) throws IOException, CoreException {
+ assertContents(file, "" + val);
+ }
+
+ protected void assertContents(IFile file, String val) throws IOException, CoreException {
+ assertEquals(val, IOUtil.getContents(file));
+ }
+
+ protected void assertContents(File file, int val) throws IOException, CoreException {
+ assertContents(file, "" + val);
+ }
+
+ protected void assertContents(File file, String val) throws IOException, CoreException {
+ assertEquals(val, IOUtil.getContents(file));
+ }
+
+ public void testMain() throws CoreException, IOException {
+ IModule mod = ServerUtil.getModule(project);
+ IModule[] module = new IModule[] { mod };
+ verifyJSTPublisher(module);
+ IFile f = project.getFolder(CONTENT_DIR).getFolder("WEB-INF").getFile("web.xml");
+
+ server = ServerRuntimeUtils.addModule(server,mod);
+ ServerRuntimeUtils.publish(server);
+ IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server));
+ IPath rootFolder = deployRoot.append(MODULE_NAME + ".war");
+ assertTrue(rootFolder.toFile().exists());
+
+ long workspaceModified = project.getFolder(CONTENT_DIR).getFolder("WEB-INF").getFile("web.xml").getLocation().toFile().lastModified();
+ long publishedModified = rootFolder.append("WEB-INF").append("web.xml").toFile().lastModified();
+
+ // FULL PUBLISH and verify web xml's timestamp
+ ServerRuntimeUtils.publish(IServer.PUBLISH_FULL, server);
+ try {
+ Thread.sleep(400);
+ } catch(InterruptedException ie) {}
+
+ long publishedModified2 = rootFolder.append("WEB-INF").append("web.xml").toFile().lastModified();
+ assertNotSame(publishedModified, publishedModified2);
+
+ server = ServerRuntimeUtils.removeModule(server, mod);
+ assertTrue(rootFolder.toFile().exists());
+ ServerRuntimeUtils.publish(server);
+ assertFalse(rootFolder.toFile().exists());
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-11-18 08:02:29 UTC (rev 26699)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-11-18 09:37:17 UTC (rev 26700)
@@ -235,8 +235,12 @@
}
public static IStatus publish(IServer server) throws CoreException {
- return server.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor());
+ return publish(IServer.PUBLISH_INCREMENTAL, server);
}
+
+ public static IStatus publish(int type, IServer server) throws CoreException {
+ return server.publish(type, new NullProgressMonitor());
+ }
public static IServer setZipped(IServer server, boolean val) {
return ServerRuntimeUtils.setServerAttribute(server, IDeployableServer.ZIP_DEPLOYMENTS_PREF, val);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java 2010-11-18 08:02:29 UTC (rev 26699)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java 2010-11-18 09:37:17 UTC (rev 26700)
@@ -37,23 +37,23 @@
}
- private static final String APP_CLIENT_PROJ_12 = "myAppClient_12";
- private static final String APP_CLIENT_PROJ_13 = "myAppClient_13";
- private static final String APP_CLIENT_PROJ_14 = "myAppClient_14";
- private static final String APP_CLIENT_PROJ_5 = "myAppClient_5";
+ public static final String APP_CLIENT_PROJ_12 = "myAppClient_12";
+ public static final String APP_CLIENT_PROJ_13 = "myAppClient_13";
+ public static final String APP_CLIENT_PROJ_14 = "myAppClient_14";
+ public static final String APP_CLIENT_PROJ_5 = "myAppClient_5";
- private static final String EJB_PROJ_11 = "myEJB_11";
- private static final String EJB_PROJ_2 = "myEJB_2";
- private static final String EJB_PROJ_21 = "myEJB_21";
- private static final String EJB_PROJ_3 = "myEJB_3";
+ public static final String EJB_PROJ_11 = "myEJB_11";
+ public static final String EJB_PROJ_2 = "myEJB_2";
+ public static final String EJB_PROJ_21 = "myEJB_21";
+ public static final String EJB_PROJ_3 = "myEJB_3";
- private static final String WEB_PROJ_22 = "myWeb_22";
- private static final String WEB_PROJ_23 = "myWeb_23";
- private static final String WEB_PROJ_24 = "myWeb_24";
- private static final String WEB_PROJ_25 = "myWeb_25";
+ public static final String WEB_PROJ_22 = "myWeb_22";
+ public static final String WEB_PROJ_23 = "myWeb_23";
+ public static final String WEB_PROJ_24 = "myWeb_24";
+ public static final String WEB_PROJ_25 = "myWeb_25";
- private static final String CONNECTOR_PROJ_1 = "myConnector_1";
- private static final String CONNECTOR_PROJ_15 = "myConnector_15";
+ public static final String CONNECTOR_PROJ_1 = "myConnector_1";
+ public static final String CONNECTOR_PROJ_15 = "myConnector_15";
/**
* Creates and returns an Connector Data Model with the given name and of the given version.
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26699 - in trunk/bpel/docs/reference/en-US: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-11-18 03:02:29 -0500 (Thu, 18 Nov 2010)
New Revision: 26699
Modified:
trunk/bpel/docs/reference/en-US/images/deploy_createdeploy_2.png
trunk/bpel/docs/reference/en-US/master_output.xml
Log:
Update BPEL User Guide
https://jira.jboss.org/browse/TOOLSDOC-90
Modified: trunk/bpel/docs/reference/en-US/images/deploy_createdeploy_2.png
===================================================================
(Binary files differ)
Modified: trunk/bpel/docs/reference/en-US/master_output.xml
===================================================================
--- trunk/bpel/docs/reference/en-US/master_output.xml 2010-11-18 03:01:45 UTC (rev 26698)
+++ trunk/bpel/docs/reference/en-US/master_output.xml 2010-11-18 08:02:29 UTC (rev 26699)
@@ -117,7 +117,7 @@
<title>Installation JBoss BPEL Tools</title>
<section id="installeclipse">
<title>Installation JBoss BPEL editor</title>
- <para>At first, you need Eclipse 3.5. You can get it from <ulink url="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downlo...">Eclipse Web Site</ulink>.
+ <para>At first, you need Eclipse 3.6. You can get it from <ulink url="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downlo...">Eclipse Web Site</ulink>.
</para>
<para>The JBoss BPEL editor is included into JBoss Tools.
You have some methods to install JBoss Tools.
@@ -134,7 +134,7 @@
<listitem diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added"> JBossAS (version 5.1.0.GA or higher),
available from </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.org/jbossas"><diffmk:wrapper diffmk:change="added">
http://www.jboss.org/jbossas</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para></listitem>
- <listitem diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">RiftSaw (version 2.0 or higher), available from </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.org/riftsaw"><diffmk:wrapper diffmk:change="added">http://www.jboss.org/riftsaw</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para></listitem>
+ <listitem diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">RiftSaw (version 2.1 or higher), available from </diffmk:wrapper><ulink diffmk:change="added" url="http://www.jboss.org/riftsaw"><diffmk:wrapper diffmk:change="added">http://www.jboss.org/riftsaw</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para></listitem>
<listitem diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Ant, available from </diffmk:wrapper><ulink diffmk:change="added" url="http://ant.apache.org"><diffmk:wrapper diffmk:change="added">here</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para></listitem>
</itemizedlist>
@@ -167,8 +167,8 @@
<para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Then in the
</diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">${RiftSaw}/install</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> folder run the command:
</diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">ant deploy -Ddatabase=hsql -Dws.stack=native -Dws.version=3.2.2.GA</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">
- It will help you to download the web service stack, and then upgrade it for JBoss AS.
- </diffmk:wrapper></para>
+ It will help you to download the web service stack, and then upgrade it for JBoss AS. Anyway, you can do it step by step by following the guide from </diffmk:wrapper> <ulink url="http://www.jboss.org/riftsaw/documentation">JBoss RiftSaw documents</ulink> or the README file in <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">${RiftSaw}/install</diffmk:wrapper></property>
+ </para>
</listitem>
</itemizedlist>
@@ -281,11 +281,56 @@
</imageobject>
</mediaobject>
</figure>
- <para>Click the <property moreinfo="none">Next</property> button. On the second page make sure that the folder <property moreinfo="none">HelloWorld/bpelContent</property><diffmk:wrapper diffmk:change="changed"> is selected.
+
+ <para>Click the <property moreinfo="none">Next</property> button. On the second page, you can custom your wsdl service details. Enter the following information:</para>
+ <table>
+
+ <title>Fields and values</title>
+ <tgroup cols="2">
+ <colspec align="left" colnum="1" colwidth="2*"></colspec>
+ <colspec colnum="2" colwidth="4*"></colspec>
+ <thead diffmk:change="added">
+ <row diffmk:change="added">
+ <entry>Field</entry>
+ <entry>Value</entry>
+
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><para>Service Name</para></entry>
+ <entry><para>a wsdl service name for the BPEL process. The default is, <property moreinfo="none">HelloWorld</property>.</para></entry>
+ </row>
+ <row>
+ <entry><para>Port Name</para></entry>
+ <entry><para>a wsdl port name for the BPEL process. The default is, <property moreinfo="none">HelloWorldPort</property>.</para></entry>
+ </row>
+ <row>
+ <entry><para>Service Address</para></entry>
+ <entry><para>an address of the wsdl service for the BPEL process. The default is, <property moreinfo="none">http://localhost:8080/HelloWorld</property>.</para></entry>
+ </row>
+ <row>
+ <entry><para>Binding Protocol</para></entry>
+ <entry><para>the binding protocal that you use in the wsdl. You can choose SOAP or HTTP. The default is, <property moreinfo="none">SOAP</property>.</para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <figure float="0">
+ <title>Create WSDL file for the BPEL Process wizardpage</title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata fileref="images/detail_createprocess_2a.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Click the <property moreinfo="none">Next</property> button. On the third page, you can choose a folder for the process file from the projects in your workspace. If not choose, The default folder <property moreinfo="none">HelloWorld/bpelContent</property><diffmk:wrapper diffmk:change="changed"> is selected.
Click </diffmk:wrapper><property moreinfo="none">Finish</property><diffmk:wrapper diffmk:change="changed">.
</diffmk:wrapper></para>
<note diffmk:change="added">
- <para>All of your files that are used in your BPEL project must be under the <property moreinfo="none">bpelContent</property><diffmk:wrapper diffmk:change="changed"> folder. Only in this case
+ <para>All of your files that are used in your BPEL project must be under the <property moreinfo="none">bpelContent</property><diffmk:wrapper diffmk:change="changed"> folder of a BPEL project. Only in this case
these files can be deployed to JBoss server.
</diffmk:wrapper></para>
</note>
@@ -418,10 +463,10 @@
</section>
<section diffmk:change="added" id="wsdl">
- <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Adding Service to WSDL file</diffmk:wrapper></title>
- <para diffmk:change="added"></para>
- <itemizedlist diffmk:change="added">
-
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Adding Service to WSDL file</diffmk:wrapper></title>
+ <para diffmk:change="added"></para>
+ <para diffmk:change="added">The HelloWorldArtifacts.wsdl has been added a service when you create a BPEL process file. You have a default service in this WSDL file. But if you want to add a service by yourself, you can follow the steps as below: </para>
+ <itemizedlist diffmk:change="added">
<listitem diffmk:change="added">
<para>Open the file "<property moreinfo="none">HelloWorldArtifacts.wsdl</property>" in the "<property moreinfo="none">HelloWorld</property><diffmk:wrapper diffmk:change="changed">" project by double-clicking the file. Right-click the WSDL editor and select
</diffmk:wrapper><property moreinfo="none">Add Service</property>. A new service should appear in the editor. Name it <property moreinfo="none">HelloWorldProcessService</property><diffmk:wrapper diffmk:change="changed">. It has the Port
@@ -489,13 +534,13 @@
<section diffmk:change="added" id="deploy">
<title>Deploy a JBoss BPEL project to JBoss BPEL Runtime</title>
<section diffmk:change="added" id="createdeploy">
- <title>Creating a bpel-deploy.xml file</title>
- <para><diffmk:wrapper diffmk:change="changed">If you want to deploy a BPEL project to JBoss BPEL Runtime, you should create a bpel-deploy.xml file.
+ <title>Creating a deploy.xml file</title>
+ <para><diffmk:wrapper diffmk:change="changed">If you want to deploy a BPEL project to JBoss BPEL Runtime, you should create a deploy.xml file.
JBoss tools can help you to create it:
</diffmk:wrapper></para>
<itemizedlist diffmk:change="added">
<listitem diffmk:change="added">
- <para><diffmk:wrapper diffmk:change="changed">Create the bpel-deploy.xml by selecting
+ <para><diffmk:wrapper diffmk:change="changed">Create the deploy.xml by selecting
</diffmk:wrapper><emphasis><property moreinfo="none">New > Other... > BPEL 2.0 > Apache ODE Deployment Descriptor</property></emphasis>. Click the <property moreinfo="none">Next</property><diffmk:wrapper diffmk:change="changed"> button.
</diffmk:wrapper></para>
<figure diffmk:change="added" float="0">
@@ -510,10 +555,10 @@
<listitem diffmk:change="added">
<para>On the next wizard page you should enter the following information:</para>
<para><emphasis><property moreinfo="none">BPEL Project</property></emphasis>: Click the <property moreinfo="none">Browse...</property><diffmk:wrapper diffmk:change="changed"> button to select the BPEL project in your workspace which you want to deploy to the runtime.
- Please note, that you should select the </diffmk:wrapper><property moreinfo="none">bpelContent</property> folder in your new BPEL project as a value of <property moreinfo="none">BPEL Project</property><diffmk:wrapper diffmk:change="changed"> field because the bpel-deploy.xml should be created in this place.
+ Please note, that you should select the </diffmk:wrapper><property moreinfo="none">bpelContent</property> folder in your new BPEL project as a value of <property moreinfo="none">BPEL Project</property><diffmk:wrapper diffmk:change="changed"> field because the deploy.xml should be created in this place.
</diffmk:wrapper></para>
- <para><emphasis><property moreinfo="none">File name</property></emphasis>: The default value is bpel-deploy.xml. Please, don't change it.</para>
- <para>Click on <property moreinfo="none">Finish</property> button to close the wizard and a new bpel-deploy.xml file will be created.</para>
+ <para><emphasis><property moreinfo="none">File name</property></emphasis>: The default value is deploy.xml. Please, don't change it.</para>
+ <para>Click on <property moreinfo="none">Finish</property> button to close the wizard and a new deploy.xml file will be created.</para>
<figure diffmk:change="added" float="0">
<title>New BPEL Deploy file Wizard</title>
<mediaobject>
@@ -524,14 +569,14 @@
</figure>
</listitem>
<listitem diffmk:change="added">
- <para><diffmk:wrapper diffmk:change="changed">Double-click the bpel-deploy.xml file to open it in ODE Descriptor Deployment Editor.
+ <para><diffmk:wrapper diffmk:change="changed">Double-click the deploy.xml file to open it in ODE Descriptor Deployment Editor.
In the </diffmk:wrapper><property moreinfo="none">Inbound Interfaces</property><diffmk:wrapper diffmk:change="changed"> section, click the
</diffmk:wrapper><property moreinfo="none">Associated Port</property> column and select <property moreinfo="none">HelloWorldProcessPort</property><diffmk:wrapper diffmk:change="changed">
in the dropdown box.The </diffmk:wrapper><property moreinfo="none">Related Service</property> and <property moreinfo="none">Binding Used</property><diffmk:wrapper diffmk:change="changed">
- columns should be automatically filled in. Save the </diffmk:wrapper><emphasis><property moreinfo="none">bpel-deploy.xml</property></emphasis><diffmk:wrapper diffmk:change="changed">.
+ columns should be automatically filled in. Save the </diffmk:wrapper><emphasis><property moreinfo="none">deploy.xml</property></emphasis><diffmk:wrapper diffmk:change="changed">.
</diffmk:wrapper></para>
<figure diffmk:change="added" float="0">
- <title>bpel-deploy.xml file editor</title>
+ <title>deploy.xml file editor</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/deploy_createdeploy_3.png"></imagedata>
@@ -600,7 +645,7 @@
<para>If some aspects of server creation is not clear, please, read <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/as/html_single/index...">JBoss Server Manager Reference Guide</ulink> for more details.</para>
</listitem>
<listitem diffmk:change="added">
- <para>You can enter the link <ulink url="http://localhost:8080/bpel/processes.html">http://localhost:8080/bpel/processes.html</ulink> to the browser to get the deployed processes.</para>
+ <para>You can enter the link <ulink url="http://localhost:8080/bpel-console/app.html">http://localhost:8080/bpel-console/app.html</ulink> to the browser to get the deployed processes.</para>
<figure float="0">
<title>The BPEL console</title>
<mediaobject>
@@ -670,7 +715,7 @@
<title diffmk:change="added"><diffmk:wrapper diffmk:change="added">New BPEL Project Wizard</diffmk:wrapper></title>
<mediaobject diffmk:change="added">
<imageobject diffmk:change="added">
- <imagedata diffmk:change="added" fileref="images/reference/bpel_ref_2a.png"></imagedata>
+ <imagedata diffmk:change="added" fileref="images/deploy_createdeploy_2.png"></imagedata>
</imageobject>
</mediaobject>
</figure>
@@ -751,7 +796,63 @@
</figure>
</listitem>
- <listitem diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">On the second page the user should select the BPEL project
+
+ <listitem diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">The second page has the following options to set:</diffmk:wrapper></para>
+ <table diffmk:change="added">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">New BPEL Process file Wizard. Second Page Options.</diffmk:wrapper></title>
+ <tgroup cols="3" diffmk:change="added">
+ <colspec align="left" colnum="1" colwidth="1*" diffmk:change="added"></colspec>
+ <colspec align="left" colnum="2" colwidth="3*" diffmk:change="added"></colspec>
+ <colspec align="left" colnum="3" colwidth="1*" diffmk:change="added"></colspec>
+
+ <thead diffmk:change="added">
+ <row diffmk:change="added">
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Option</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Description</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Default</diffmk:wrapper></entry>
+ </row>
+ </thead>
+ <tbody diffmk:change="added">
+ <row diffmk:change="added">
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Service Name</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Enter a wsdl service name for the BPEL process.</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">The process name</diffmk:wrapper></entry>
+ </row>
+
+ <row diffmk:change="added">
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Port Name</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Enter a wsdl port name for the BPEL process.</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">The process name + 'Port' </diffmk:wrapper></entry>
+ </row>
+
+ <row diffmk:change="added">
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Service Address</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Enter an address of the wsdl service for the BPEL process.</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">http://localhost:8080/ + process name </diffmk:wrapper></entry>
+ </row>
+
+ <row diffmk:change="added">
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Binding Protocol</diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Choose the binding protocal that you use in the wsdl: SOAP or HTTP </diffmk:wrapper></entry>
+ <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">SOAP </diffmk:wrapper></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <figure diffmk:change="added" float="0">
+ <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">New BPEL Process file Wizard</diffmk:wrapper></title>
+ <mediaobject diffmk:change="added">
+ <imageobject diffmk:change="added">
+ <imagedata diffmk:change="added" fileref="images/reference/bpel_ref_3a.png"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ </listitem>
+
+
+
+ <listitem diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">On the third page the user should select the BPEL project
and folder where the process file will be created:</diffmk:wrapper></para>
<figure diffmk:change="added" float="0">
<title diffmk:change="added"><diffmk:wrapper diffmk:change="added">New BPEL Process file Wizard</diffmk:wrapper></title>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26698 - trunk/jsf/docs/jsf_tools_tutorial/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-11-17 22:01:45 -0500 (Wed, 17 Nov 2010)
New Revision: 26698
Modified:
trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml
Log:
updated version details
Modified: trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml 2010-11-18 01:15:31 UTC (rev 26697)
+++ trunk/jsf/docs/jsf_tools_tutorial/en-US/Book_Info.xml 2010-11-18 03:01:45 UTC (rev 26698)
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<bookinfo><title>JSF Tools Tutorial</title><subtitle>Provides information relating to the JSF Tools module.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3.0</productnumber><edition>3.0.1</edition><pubsnumber>0</pubsnumber><abstract><para>The JSF Tools Tutorial explains how to use the JSF Tools module to create a simple JSF application.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></bookinfo>
+<bookinfo><title>JSF Tools Tutorial</title><subtitle>Provides information relating to the JSF Tools module.</subtitle><productname>JBoss Developer Studio</productname><productnumber>4.0</productnumber><edition>4.0.0</edition><pubsnumber>1</pubsnumber><abstract><para>The JSF Tools Tutorial explains how to use the JSF Tools module to create a simple JSF application.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></bookinfo>
15 years, 5 months
- 1
- 0