JBoss Tools SVN: r28653 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-27 08:49:12 -0500 (Thu, 27 Jan 2011)
New Revision: 28653
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
[JBIDE-8254] replaced the warning dialog by a similar decoration to the key text field. Warning is displayed in the title area and in the tooltip of the decoration
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-27 12:30:29 UTC (rev 28652)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-27 13:49:12 UTC (rev 28653)
@@ -1,3 +1,11 @@
+2011-01-27 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
+ (KeyValidator.validate):
+ (KeyValidator.isKeyKnowToSsh):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java (performFinish):
+ [JBIDE-8254] replaced the warning dialog by a similar decoration to the key text field. Warning is displayed in the title area and in the tooltip of the decoration
+
2011-01-26 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-27 12:30:29 UTC (rev 28652)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-27 13:49:12 UTC (rev 28653)
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.wizards;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -403,7 +405,7 @@
WidgetProperties.text(SWT.Modify).observeDelayed(KEY_CHECK_DELAY, text),
BeanProperties.value(NewInstancePageModel.class, NewInstancePageModel.PROPERTY_KEYID).observe(model),
new UpdateValueStrategy()
- .setBeforeSetValidator(
+ .setAfterGetValidator(
new MandatoryStringValidator(WizardMessages.getString(MUST_ENTER_A_KEYNAME)))
.setBeforeSetValidator(
new KeyValidator()),
@@ -420,6 +422,11 @@
if (value instanceof String
&& ((String) value).length() > 0) {
if (doesKeyExist((String) value)) {
+ if (!isKeyKnowToSsh((String) value)) {
+ return ValidationStatus
+ .warning(
+ "Key is not known to the ssh subsystem (SSH2 preferenes, private keys). ");
+ }
return ValidationStatus.ok();
}
}
@@ -427,6 +434,15 @@
"The key is not known to cloud \"{0}\"", cloud.getName()));
}
+ private boolean isKeyKnowToSsh(String keyId) {
+ try {
+ File file = PemFileManager.getFile(keyId, SshPrivateKeysPreferences.getSshKeyDirectory());
+ return SshPrivateKeysPreferences.contains(file.getAbsolutePath());
+ } catch (FileNotFoundException e) {
+ return false;
+ }
+ }
+
private boolean doesKeyExist(String keyId) {
try {
return cloud.getKey(keyId) != null;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-27 12:30:29 UTC (rev 28652)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-27 13:49:12 UTC (rev 28653)
@@ -10,13 +10,9 @@
*******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.wizards;
-import java.io.File;
-import java.io.FileNotFoundException;
-
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.jboss.tools.common.jobs.ChainedJob;
import org.jboss.tools.deltacloud.core.DeltaCloud;
@@ -106,7 +102,6 @@
Exception e = null;
try {
if (isProceed()) {
- warnSshPrivateKey(keyId);
instance = cloud.createInstance(name, imageId, realmId, profileId, keyId, memory, storage);
if (instance != null) {
result = true;
@@ -129,23 +124,6 @@
return result;
}
- private void warnSshPrivateKey(String keyId) {
- try {
- File file = PemFileManager.getFile(keyId, SshPrivateKeysPreferences.getSshKeyDirectory());
- boolean isKnowPrivateKey = SshPrivateKeysPreferences.contains(file.getAbsolutePath());
-
- if (!isKnowPrivateKey) {
- MessageDialog
- .openWarning(
- getShell(),
- "Instance key is not private key",
- "The instance key you have chosen is not known as private key to the ssh subsystem. If you need this key to connect to your instance, you'll have to download it and add it to the private keys in the SSH preferences.");
- }
- } catch (FileNotFoundException e) {
-
- }
- }
-
private void scheduleJobs() {
ChainedJob first =
new InstanceStateJob(
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28652 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-27 07:30:29 -0500 (Thu, 27 Jan 2011)
New Revision: 28652
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigFilteredTreeConstraint.java
Log:
JBIDE-8222
https://issues.jboss.org/browse/JBIDE-8222
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigFilteredTreeConstraint.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigFilteredTreeConstraint.java 2011-01-27 12:26:39 UTC (rev 28651)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigFilteredTreeConstraint.java 2011-01-27 12:30:29 UTC (rev 28652)
@@ -29,7 +29,7 @@
return (HIDING_ALL_CHILDREN_ENTITIES.indexOf("." + entity + ".") >= 0); //$NON-NLS-1$ //$NON-NLS-2$
}
- static String HIDING_SOME_CHILDREN_ENTITIES = "." + ENT_FACESCONFIG_10 + "." + ENT_FACESCONFIG_11 + "." + ENT_FACESCONFIG_12 + "." + "JSFApplication.JSFApplication12."; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ static String HIDING_SOME_CHILDREN_ENTITIES = "." + ENT_FACESCONFIG_10 + "." + ENT_FACESCONFIG_11 + "." + ENT_FACESCONFIG_12 + "." + ENT_FACESCONFIG_20 + "." + "JSFApplication.JSFApplication12."; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
public boolean isHidingSomeChildren(XModelObject object) {
String entity = object.getModelEntity().getName();
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28651 - branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.xml/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-01-27 07:26:39 -0500 (Thu, 27 Jan 2011)
New Revision: 28651
Modified:
branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8225 Added org.eclipse.wst.xsd.ui, org.eclipse.wst.dtd.ui to dependency list.
Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-01-27 11:55:38 UTC (rev 28650)
+++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2011-01-27 12:26:39 UTC (rev 28651)
@@ -24,6 +24,8 @@
org.eclipse.wst.xml.ui,
org.eclipse.wst.sse.ui,
org.eclipse.wst.sse.core,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.eclipse.wst.xsd.ui,
+ org.eclipse.wst.dtd.ui
Bundle-Version: 3.2.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28650 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-27 06:55:38 -0500 (Thu, 27 Jan 2011)
New Revision: 28650
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java
Log:
JBIDE-8217
https://issues.jboss.org/browse/JBIDE-8217
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2011-01-27 10:33:01 UTC (rev 28649)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLabelProvider.java 2011-01-27 11:55:38 UTC (rev 28650)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.seam.ui.views;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -96,6 +97,8 @@
return ""; //$NON-NLS-1$
} else if(element instanceof ISeamProject) {
return ((IProjectNature)element).getProject().getName();
+ } else if (element instanceof IProject) {
+ return ((IProject)element).getName();
} else if(element instanceof ISeamScope) {
return ((ISeamScope)element).getType().getLabel();
} else if(element instanceof ISeamPackage) {
@@ -145,6 +148,8 @@
public Image getImage(Object obj) {
if (obj instanceof ISeamProject) {
return SeamUiImages.PROJECT_IMAGE;
+ } else if (obj instanceof IProject) {
+ return SeamUiImages.PROJECT_IMAGE;
} else if(obj instanceof ISeamScope) {
return SeamUiImages.SCOPE_IMAGE;
} else if(obj instanceof ISeamPackage) {
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28649 - in trunk/deltacloud: plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-27 05:33:01 -0500 (Thu, 27 Jan 2011)
New Revision: 28649
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java
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/DeltaCloudManager.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.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
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java
Log:
[JBIDE-8250]
- renamed Driver to DeltaCloudDriver, renamed ServerType to Driver
- moved driver unmarshalling to APIUnmarshaller
- added tests for APIUnmarshaller
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-27 10:33:01 UTC (rev 28649)
@@ -1,5 +1,11 @@
2011-01-27 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java (getServerType):
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getDriver):
+ [JBIDE-8250]
+ - renamed Driver to DeltaCloudDriver, renamed ServerType to Driver
+ - moved driver unmarshalling to APIUnmarshaller
+ - added tests for APIUnmarshaller
* src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java (UNAUTHORIZED):
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java (throwOnHttpErrors):
[JBIDE-8250] authorization error is status code 401 (was: 403)
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 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -18,10 +18,10 @@
import java.util.regex.PatternSyntaxException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
import org.jboss.tools.deltacloud.core.client.DeltaCloudAuthClientException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
import org.jboss.tools.deltacloud.core.client.DeltaCloudNotFoundClientException;
import org.jboss.tools.deltacloud.core.client.HardwareProfile;
import org.jboss.tools.deltacloud.core.client.Image;
@@ -45,7 +45,7 @@
private String name;
private String username;
private String url;
- private Driver driver;
+ private DeltaCloudDriver driver;
private String lastKeyname = "";
private String lastImageId = "";
@@ -68,18 +68,18 @@
this(name, url, username, passwd, null);
}
- public DeltaCloud(String name, String url, String username, String password, Driver driver)
+ public DeltaCloud(String name, String url, String username, String password, DeltaCloudDriver driver)
throws DeltaCloudException {
this(name, url, username, password, driver, IImageFilter.ALL_STRING, IInstanceFilter.ALL_STRING, new ArrayList<IInstanceAliasMapping>());
}
- public DeltaCloud(String name, String url, String username, Driver driver, String imageFilterRules,
+ public DeltaCloud(String name, String url, String username, DeltaCloudDriver driver, String imageFilterRules,
String instanceFilterRules, Collection<IInstanceAliasMapping> instanceAliasMappings)
throws DeltaCloudException {
this(name, url, username, null, driver, imageFilterRules, instanceFilterRules, instanceAliasMappings);
}
- public DeltaCloud(String name, String url, String username, String password, Driver driver,
+ public DeltaCloud(String name, String url, String username, String password, DeltaCloudDriver driver,
String imageFilterRules, String instanceFilterRules, Collection<IInstanceAliasMapping> instanceAliasMappings)
throws DeltaCloudException {
this.url = url;
@@ -93,7 +93,7 @@
this.instanceAliasMappings = instanceAliasMappings;
}
- public void update(String name, String url, String username, String password, Driver driver)
+ public void update(String name, String url, String username, String password, DeltaCloudDriver driver)
throws DeltaCloudException {
this.driver = driver;
@@ -174,13 +174,13 @@
return passwordStore.getPassword();
}
- public Driver getDriver() {
+ public DeltaCloudDriver getDriver() {
return driver;
}
public boolean isValid() {
return driver != null
- && driver != Driver.UNKNOWN;
+ && driver != DeltaCloudDriver.UNKNOWN;
}
public String getLastImageId() {
@@ -612,10 +612,10 @@
return name;
}
- public static Driver getServerDriver(String url) throws DeltaCloudException {
+ public static DeltaCloudDriver getServerDriver(String url) throws DeltaCloudException {
try {
- DeltaCloudServerType serverType = new DeltaCloudClientImpl(url).getServerType();
- return Driver.valueOf(serverType);
+ Driver driver = new DeltaCloudClientImpl(url).getServerType();
+ return DeltaCloudDriver.valueOf(driver);
} catch (Exception e) {
// TODO internationalize strings
throw new DeltaCloudException(
Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java (from rev 28633, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java)
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.core;
+
+import org.jboss.tools.deltacloud.core.client.API.Driver;
+
+
+/**
+ * @author André Dietisheim
+ */
+public enum DeltaCloudDriver {
+
+ MOCK(Driver.MOCK), EC2(Driver.EC2), UNKNOWN(Driver.UNKNOWN);
+
+ private Driver driver;
+
+ private DeltaCloudDriver(Driver driver) {
+ this.driver = driver;
+ }
+
+ public static DeltaCloudDriver valueOf(Driver driver) {
+ for(DeltaCloudDriver deltaCloudDriver : values()) {
+ if (deltaCloudDriver.driver.equals(driver)) {
+ return deltaCloudDriver;
+ }
+ }
+ return UNKNOWN;
+ }
+
+ public static DeltaCloudDriver checkedValueOf(String name) {
+ for (DeltaCloudDriver driver : values()) {
+ if (driver.name().equals(name)) {
+ return driver;
+ }
+ }
+ return UNKNOWN;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -103,7 +103,7 @@
String username = URLEncoder.encode(
attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_USERNAME).getNodeValue(),
DeltaCloudXMLBuilder.ENCODING); // $NON-NLS-1$
- Driver driver = Driver.checkedValueOf(attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_TYPE).getNodeValue()); // $NON-NLS-1$
+ DeltaCloudDriver driver = DeltaCloudDriver.checkedValueOf(attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_TYPE).getNodeValue()); // $NON-NLS-1$
String imageFilterRules = getImageFilterRules(attrs.getNamedItem("imagefilter")); // $NON-NLS-1$
String instanceFilterRules = getInstanceFilterRules(attrs.getNamedItem("instancefilter")); // $NON-NLS-1$
String lastKeyName = getNodeValue(attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_LASTKEYNAME)); // $NON-NLS-1$
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.deltacloud.core;
-
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
-
-/**
- * @author André Dietisheim
- */
-public enum Driver {
-
- MOCK(DeltaCloudServerType.MOCK), EC2(DeltaCloudServerType.EC2), UNKNOWN(DeltaCloudServerType.UNKNOWN);
-
- private DeltaCloudServerType deltaCloudServerType;
-
- private Driver(DeltaCloudServerType deltaCloudServerType) {
- this.deltaCloudServerType = deltaCloudServerType;
- }
-
- public static Driver valueOf(DeltaCloudServerType deltaCloudServerType) {
- for(Driver type : values()) {
- if (type.deltaCloudServerType.equals(deltaCloudServerType)) {
- return type;
- }
- }
- return UNKNOWN;
- }
-
- public static Driver checkedValueOf(String name) {
- for (Driver type : values()) {
- if (type.name().equals(name)) {
- return type;
- }
- }
- return UNKNOWN;
- }
-}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.core.client;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class API extends AbstractDeltaCloudActionAwareObject<KeyAction> {
+
+ private static final long serialVersionUID = 1L;
+
+ public static enum Driver {
+ UNKNOWN, MOCK, EC2;
+
+ public static Driver checkedValueOf(String name) {
+ for (Driver driver : values()) {
+ if (driver.name().equals(name)) {
+ return driver;
+ }
+ }
+ return UNKNOWN;
+ }
+
+ }
+
+ private Driver driver;
+
+ public API() {
+ }
+
+ public void setDriver(Driver driver) {
+ this.driver = driver;
+ }
+
+ public void setDriver(String driver) {
+ setDriver(Driver.checkedValueOf(driver.toUpperCase()));
+ }
+
+ public Driver getDriver() {
+ return driver;
+ }
+
+ @Override
+ public String toString() {
+ return "API [driver=" + driver.name() + super.toString() + "]";
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -12,7 +12,7 @@
import java.util.List;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
/**
* @author Martyn Taylor
@@ -27,7 +27,7 @@
*
* @see DeltaCloudServerType
*/
- public DeltaCloudServerType getServerType();
+ public Driver getServerType();
/**
* Returns a list of Delta Cloud Realms
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 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -10,11 +10,8 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.core.client;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
@@ -22,10 +19,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
@@ -34,6 +27,7 @@
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
import org.jboss.tools.deltacloud.core.client.request.CreateInstanceRequest;
import org.jboss.tools.deltacloud.core.client.request.CreateKeyRequest;
import org.jboss.tools.deltacloud.core.client.request.DeleteKeyRequest;
@@ -50,6 +44,7 @@
import org.jboss.tools.deltacloud.core.client.request.ListRealmsRequest;
import org.jboss.tools.deltacloud.core.client.request.PerformInstanceActionRequest;
import org.jboss.tools.deltacloud.core.client.request.TypeRequest;
+import org.jboss.tools.deltacloud.core.client.unmarshal.APIUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.HardwareProfileUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.HardwareProfilesUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.ImageUnmarshaller;
@@ -60,29 +55,16 @@
import org.jboss.tools.deltacloud.core.client.unmarshal.KeysUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.RealmUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.RealmsUnmarshaller;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* @author Andre Dietisheim (based on prior implementation by Martyn Taylor)
*/
public class DeltaCloudClientImpl implements InternalDeltaCloudClient {
- private static final String DOCUMENT_ELEMENT_DRIVER = "driver";
- private static final String DOCUMENT_ELEMENT_API = "api";
-
private String baseUrl;
private String username;
private String password;
- private DocumentBuilderFactory documentBuilderFactory;
- public static enum DeltaCloudServerType {
- UNKNOWN, MOCK, EC2
- }
-
public DeltaCloudClientImpl(String url) throws MalformedURLException,
DeltaCloudClientException {
this(url, null, null);
@@ -92,7 +74,6 @@
this.baseUrl = url;
this.username = username;
this.password = password;
- this.documentBuilderFactory = DocumentBuilderFactory.newInstance();
}
protected InputStream request(DeltaCloudRequest deltaCloudRequest)
@@ -120,19 +101,6 @@
}
}
- protected String requestStringResponse(DeltaCloudRequest deltaCloudRequest)
- throws DeltaCloudClientException {
- try {
- InputStream inputStream = request(deltaCloudRequest);
- if (inputStream == null) {
- return null;
- }
- return getResponse(inputStream);
- } catch (IOException e) {
- throw new DeltaCloudClientException(e);
- }
- }
-
private void throwOnHttpErrors(URL requestUrl, HttpResponse httpResponse)
throws DeltaCloudClientException {
int statusCode = httpResponse.getStatusLine().getStatusCode();
@@ -158,15 +126,6 @@
}
}
- private String getResponse(InputStream inputStream) throws IOException,
- DeltaCloudClientException {
- if (inputStream == null) {
- return null;
- }
- String xml = readInputStreamToString(inputStream);
- return xml;
- }
-
/**
* Returns a request instance for the given request type and url.
*
@@ -216,50 +175,15 @@
return httpClient;
}
- private static String readInputStreamToString(InputStream is)
- throws DeltaCloudClientException {
+ public Driver getServerType() {
try {
- try {
- if (is != null) {
- StringBuilder sb = new StringBuilder();
- String line = null;
-
- BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
- while ((line = reader.readLine()) != null) {
- sb.append(line).append("\n");
- }
- return sb.toString();
- }
- } finally {
- is.close();
- }
- } catch (Exception e) {
- throw new DeltaCloudClientException(
- "Error converting Response to String", e);
+ InputStream response = request(new TypeRequest(baseUrl));
+ API api = new APIUnmarshaller().unmarshall(response, new API());
+ return api.getDriver();
+ } catch (DeltaCloudClientException e) {
+ return Driver.UNKNOWN;
}
- return "";
}
-
- public DeltaCloudServerType getServerType() {
- DeltaCloudServerType serverType = DeltaCloudServerType.UNKNOWN;
- try {
- String apiResponse = requestStringResponse(new TypeRequest(baseUrl));
- Document document = getDocument(apiResponse);
- NodeList elements = document.getElementsByTagName(DOCUMENT_ELEMENT_API);
- if (elements.getLength() > 0) {
- Node n = elements.item(0);
- Node driver = n.getAttributes().getNamedItem(DOCUMENT_ELEMENT_DRIVER);
- if (driver != null) {
- String driverValue = driver.getNodeValue();
- serverType = DeltaCloudServerType.valueOf(driverValue.toUpperCase());
- }
- }
- } catch (Exception e) {
- serverType = DeltaCloudServerType.UNKNOWN;
- }
- return serverType;
- }
-
@Override
public Instance createInstance(String imageId) throws DeltaCloudClientException {
try {
@@ -412,13 +336,6 @@
return key;
}
- private Document getDocument(String response) throws ParserConfigurationException, SAXException, IOException {
- InputSource is = new InputSource(new StringReader(response));
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
- Document document = documentBuilder.parse(is);
- return document;
- }
-
public boolean performInstanceAction(InstanceAction action) throws DeltaCloudClientException {
if (action != null) {
try {
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -1,18 +0,0 @@
-package org.jboss.tools.deltacloud.core.client;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class KeyActionXmlAdapter extends XmlAdapter<String, KeyAction> {
-
- @Override
- public KeyAction unmarshal(String v) throws Exception {
- return null;
- }
-
- @Override
- public String marshal(KeyAction v) throws Exception {
- return null;
- }
-
-
-}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.deltacloud.core.client.unmarshal;
+
+import org.jboss.tools.deltacloud.core.client.API;
+import org.w3c.dom.Element;
+
+/**
+ * @author André Dietisheim
+ */
+public class APIUnmarshaller extends AbstractDOMUnmarshaller<API> {
+
+ public APIUnmarshaller() {
+ super("api", API.class);
+ }
+
+ protected API doUnmarshall(Element element, API server) throws Exception {
+ if (element != null) {
+ server.setDriver(getAttributeText("driver", element));
+ }
+ return server;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-27 10:33:01 UTC (rev 28649)
@@ -18,7 +18,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -debug"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<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"/>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -56,10 +56,9 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
-import org.jboss.tools.deltacloud.core.Driver;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.CompositeValidator;
@@ -126,12 +125,12 @@
private Label typeLabel;
- public DeltaCloudTypeLabelAdapter(Driver cloudType, Label typeLabel) {
+ public DeltaCloudTypeLabelAdapter(DeltaCloudDriver cloudType, Label typeLabel) {
this.typeLabel = typeLabel;
init(cloudType);
}
- private void init(Driver cloudType) {
+ private void init(DeltaCloudDriver cloudType) {
setLabelText(cloudType);
}
@@ -142,7 +141,7 @@
}
private void setLabelText(Object cloudType) {
- if (cloudType != null && !Driver.UNKNOWN.equals(cloudType)) {
+ if (cloudType != null && !DeltaCloudDriver.UNKNOWN.equals(cloudType)) {
typeLabel.setText(cloudType.toString());
} else {
typeLabel.setText("?"); // $NON-NLS-1$
@@ -302,7 +301,7 @@
}
public CloudConnectionPage(String pageName, String defaultName, String defaultUrl, String defaultUsername,
- String defaultPassword, Driver defaultDriver, CloudConnection cloudConnection) throws MalformedURLException {
+ String defaultPassword, DeltaCloudDriver defaultDriver, CloudConnection cloudConnection) throws MalformedURLException {
super(pageName);
this.connectionModel =
new CloudConnectionPageModel(defaultName, defaultUrl, defaultUsername, defaultPassword, defaultDriver);
@@ -540,8 +539,8 @@
*/
IObservableValue cloudTypeObservable = urlToCloudTypeConverter.getCloudTypeObservable();
Object value = cloudTypeObservable.getValue();
- Assert.isTrue(value == null || value instanceof Driver);
- DeltaCloudTypeLabelAdapter cloudTypeAdapter = new DeltaCloudTypeLabelAdapter((Driver) value, typeLabel);
+ Assert.isTrue(value == null || value instanceof DeltaCloudDriver);
+ DeltaCloudTypeLabelAdapter cloudTypeAdapter = new DeltaCloudTypeLabelAdapter((DeltaCloudDriver) value, typeLabel);
cloudTypeObservable.addValueChangeListener(cloudTypeAdapter);
ControlDecorationSupport.create(urlTypeBinding, SWT.LEFT | SWT.TOP);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -12,7 +12,7 @@
import java.net.MalformedURLException;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.internal.deltacloud.core.observable.ObservablePojo;
/**
@@ -35,18 +35,18 @@
private String username;
private String password;
- private Driver driver;
+ private DeltaCloudDriver driver;
private String initialName;
public CloudConnectionPageModel() {
- this("", "", "", "", Driver.UNKNOWN);
+ this("", "", "", "", DeltaCloudDriver.UNKNOWN);
}
public CloudConnectionPageModel(String name, String url, String username, String password) throws MalformedURLException {
- this(name, url, username, password, Driver.UNKNOWN);
+ this(name, url, username, password, DeltaCloudDriver.UNKNOWN);
}
- public CloudConnectionPageModel(String name, String url, String username, String password, Driver driver) {
+ public CloudConnectionPageModel(String name, String url, String username, String password, DeltaCloudDriver driver) {
this.name = name;
this.initialName = name;
this.url = url;
@@ -91,11 +91,11 @@
firePropertyChange(PROPERTY_URL, this.url, this.url = url);
}
- public Driver getDriver() {
+ public DeltaCloudDriver getDriver() {
return driver;
}
- public void setDriver(Driver driver) {
+ public void setDriver(DeltaCloudDriver driver) {
firePropertyChange(PROPERTY_DRIVER, this.driver, this.driver = driver);
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -13,7 +13,7 @@
import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.runtime.IStatus;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
/**
* @author André Dietisheim
@@ -23,7 +23,7 @@
@Override
public IStatus validate(Object value) {
if (value != null
- && !Driver.UNKNOWN.equals(value)) {
+ && !DeltaCloudDriver.UNKNOWN.equals(value)) {
return ValidationStatus.ok();
} else {
return ValidationStatus.warning(WizardMessages.getString("IllegalCloudUrl.msg")); //$NON-NLS-1$
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 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -13,7 +13,7 @@
import java.text.MessageFormat;
import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
/**
@@ -34,7 +34,7 @@
String url = mainPage.getModel().getUrl();
String username = mainPage.getModel().getUsername();
String password = mainPage.getModel().getPassword();
- Driver driver = mainPage.getModel().getDriver();
+ DeltaCloudDriver driver = mainPage.getModel().getDriver();
try {
initialCloud.update(name, url, username, password, driver);
} catch (Exception e) {
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 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -19,7 +19,7 @@
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.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.internal.deltacloud.ui.preferences.IPreferenceKeys;
@@ -111,7 +111,7 @@
String username = mainPage.getModel().getUsername();
String password = mainPage.getModel().getPassword();
- Driver driver = mainPage.getModel().getDriver();
+ DeltaCloudDriver driver = mainPage.getModel().getDriver();
try {
DeltaCloud newCloud = new DeltaCloud(name, url, username, password, driver);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -16,7 +16,7 @@
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
/**
* A class that converts an url (string) to a DeltaCloudType (enum). The state
@@ -34,22 +34,22 @@
IObservableValue cloudTypeObservable = new WritableValue();
public Url2DriverConverter() {
- super(String.class, Driver.class);
+ super(String.class, DeltaCloudDriver.class);
}
@Override
public Object convert(Object fromObject) {
String deltaCloudUrl = (String) fromObject;
- Driver cloudType = getCloudType(deltaCloudUrl);
+ DeltaCloudDriver cloudType = getCloudType(deltaCloudUrl);
cloudTypeObservable.setValue(cloudType);
return cloudType;
}
- private Driver getCloudType(String url) {
+ private DeltaCloudDriver getCloudType(String url) {
try {
return DeltaCloud.getServerDriver(url);
} catch (DeltaCloudException e) {
- return Driver.UNKNOWN;
+ return DeltaCloudDriver.UNKNOWN;
}
}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch 2011-01-27 10:33:01 UTC (rev 28649)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.ui,org.jboss.tools.ui.bot.ext,org.jboss.ide.eclipse.as.core,org.jboss.tools.common.projecttemplates,org.jboss.ide.eclipse.as.rse.core,org.jboss.tools.tests.performance,org.jboss.tools.common.el.core,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.ide.eclipse.archives.core,org.jboss.tools.common.verification,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.jmx.core.test,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.deltacloud.integration,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.jmx.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jbos!
s.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.tools.common.meta.ui,org.jboss.ide.eclipse.archives.webtools,org.jboss.tools.deltacloud.docs,org.jboss.tools.common.verification.ui.test,org.jboss.ide.eclipse.as.rse.ui,org.jboss.tools.common.verification.ui,org.jboss.ide.eclipse.as.wtp.core,org.jboss.tools.common.test,org.jboss.tools.deltacloud.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.eclipse.jsch.ui,org.jboss.ide.eclipse.archives.ui,org.jboss.tools.common.el.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.jmx.ui.test,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.as.ui,org.jboss.ide.eclipse.archives.ui.test,org.jboss.ide.eclipse.as.doc.user,org.jboss.tools.jmx.core,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.internal.deltacloud.test.core.client.APIDomUnmarshallingTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.deltacloud.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<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"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.security@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.apache.xerces@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.osgi.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.commands@default:de!
fault,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.compare@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.jface.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jface@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.ui@default:default,org.eclipse.swt@default:default,com.ibm.ic!
u@default:default,org.eclipse.wst.common.environment@default:d!
efault,o
rg.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.debug.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.n!
avigator.resources@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.help@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.engine@default:default,org.hamcrest.core@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclip!
se.wst.common.frameworks@default:default,javax.servlet@default!
:default
,org.eclipse.wst.validation@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ltk.ui.refactoring@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.deltacloud.test@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch 2011-01-27 10:33:01 UTC (rev 28649)
@@ -12,7 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.ui,org.jboss.tools.ui.bot.ext,org.jboss.ide.eclipse.as.core,org.jboss.tools.common.projecttemplates,org.jboss.ide.eclipse.as.rse.core,org.jboss.tools.tests.performance,org.jboss.tools.common.el.core,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.ide.eclipse.archives.core,org.jboss.tools.common.verification,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.jmx.core.test,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.deltacloud.integration,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.jmx.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jbos!
s.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.tools.common.meta.ui,org.jboss.ide.eclipse.archives.webtools,org.jboss.tools.deltacloud.docs,org.jboss.tools.common.verification.ui.test,org.jboss.ide.eclipse.as.rse.ui,org.jboss.tools.common.verification.ui,org.jboss.ide.eclipse.as.wtp.core,org.jboss.tools.common.test,org.jboss.tools.deltacloud.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.eclipse.jsch.ui,org.jboss.ide.eclipse.archives.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.common.el.ui,org.jboss.tools.jmx.ui.test,org.jboss.ide.eclipse.as.ssh,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.as.ui,org.jboss.ide.eclipse.archives.ui.test,org.jboss.ide.eclipse.as.doc.user,org.jboss.tools.jmx.core,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.ui,org.jboss.tools.ui.bot.ext,org.jboss.ide.eclipse.as.core,org.jboss.tools.common.projecttemplates,org.jboss.ide.eclipse.as.rse.core,org.jboss.tools.tests.performance,org.jboss.tools.common.el.core,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.ide.eclipse.archives.core,org.jboss.tools.common.verification,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.jmx.core.test,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.deltacloud.integration,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.jmx.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jbos!
s.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.tools.common.meta.ui,org.jboss.ide.eclipse.archives.webtools,org.jboss.tools.deltacloud.docs,org.jboss.tools.common.verification.ui.test,org.jboss.ide.eclipse.as.rse.ui,org.jboss.tools.common.verification.ui,org.jboss.ide.eclipse.as.wtp.core,org.jboss.tools.common.test,org.jboss.tools.deltacloud.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.eclipse.jsch.ui,org.jboss.ide.eclipse.archives.ui,org.jboss.tools.common.el.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.jmx.ui.test,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.as.ui,org.jboss.ide.eclipse.archives.ui.test,org.jboss.ide.eclipse.as.doc.user,org.jboss.tools.jmx.core,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -37,8 +37,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.compare.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.emf@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.common@2:true,org.eclipse.debug.ui@default:default,org.eclipse.ecf.filetransfer@default:default!
,org.eclipse.team.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.text@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.xml.resolver@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jface@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.core@default:default,org.eclipse.search@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclips!
e.equinox.concurrent@default:default,org.eclipse.wst.common.pr!
oject.fa
cet.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.xml.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.security@default:default,org.apache.xerces@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.commands@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse!
.wst.sse.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,javax.xml@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,javax.servlet@default:default,org.eclipse.ui@default:default,org.eclipse.compare@default:default,org.eclipse.help@default:default!
,org.eclipse.core.filebuffers@default:default,org.eclipse.team!
.ui@defa
ult:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ui.forms@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.gwt.ui@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.security@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.apache.xerces@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.osgi.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.commands@default:de!
fault,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.compare@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.jface.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jface@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.ui@default:default,org.eclipse.swt@default:default,com.ibm.ic!
u@default:default,org.eclipse.wst.common.environment@default:d!
efault,o
rg.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.debug.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.n!
avigator.resources@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.help@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.engine@default:default,org.hamcrest.core@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclip!
se.wst.common.frameworks@default:default,javax.servlet@default!
:default
,org.eclipse.wst.validation@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ltk.ui.refactoring@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.deltacloud.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch 2011-01-27 10:33:01 UTC (rev 28649)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
@@ -12,18 +11,18 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<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.common,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.usage,org.jboss.tools.usage.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests,org.jruby.jruby"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.usage,org.jboss.tools.usage.test,org.jboss.tools.tests,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.ui"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java"/>
+<listEntry value="/org.jboss.tools.deltacloud.test"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,8 +36,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.net@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.edit@default:default,org.apache.ant@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.common.emfworkbench.integrati!
on@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.resources@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.security@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.xml.serializer@default:default,org.eclipse.jface@default:default,org.eclipse.emf.common@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.team.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.sdk@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ecf.filetransfer@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:def!
ault,org.eclipse.jem.util@default:default,org.eclipse.wst.vali!
dation@d
efault:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.text@default:default,org.eclipse.wst.sse.core@default:default,javax.xml@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.ui.forms@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.navigator.resources@default:default,org.apache.jasper@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.pr!
oject.facet.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.hamcrest.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.commands@default:default,org.eclipse.compare.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.compare@default:default,org.eclipse.ui.cheatsheets@default:default,org.jboss.tools.xulrunner.initialize!
r@default:false,org.apache.lucene@default:default,org.apache.x!
ml.resol
ver@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.common.core@default:default,org.junit4@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.emf.ecore@default:default,!
org.eclipse.update.configurator@3:true,org.eclipse.help.ui@default:default,javax.servlet.jsp@default:default,org.apache.xerces@default:default,org.eclipse.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.test@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.apache.xerces@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.apache.jasper@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.osgi!
.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.compare@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jface.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene.!
analysis@default:default,org.eclipse.core.resources@default:de!
fault,or
g.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jface@default:default,org.junit4@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.ui@default:default,org.eclipse.swt@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.server@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.update.configurator@3:true,org.eclipse.help.base@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf!
.ecore.change@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.debug.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.servlet.jsp@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons!
.codec*1.3.0.v20100518-1140@default:default,org.apache.commons!
.el@defa
ult:default,org.eclipse.help@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.engine@default:default,org.hamcrest.core@default:default,org.eclipse.ecf@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.emf.edit@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.apache.lucene@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.frameworks@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.eclipse.wst.validation@default:default,org.eclipse.sdk@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.r!
untime@default:true,org.eclipse.ltk.ui.refactoring@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common.text.ext@default:default,org.jboss.tools.common.verification.test@default:default,org.jboss.tools.common.model.ui.capabilities@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.common.el.ui@default:default,org.jboss.tools.jmx.core.test@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common.meta.ui@default:default,org.jboss.ide.eclipse.as.ui.mbeans@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.common.model@default:default,org.eclipse.jsch.ui@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.as.archives.integration.test@default:default,org.jboss.tools.common.resref.ui@default:default,org.jboss.tools.common.model.ui@default:default,org.jboss.tools.common.projecttemplates@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.as.rse.ui@default:defa!
ult,org.jboss.tools.jmx.ui.test@default:default,org.jboss.ide.eclipse.as.ui.test@default:default,org.jboss.ide.eclipse.as.test@default:default,org.jboss.tools.common.gef@default:default,org.jboss.tools.common.el.core.test@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.common.model.test@default:default,org.jboss.tools.common.model.ui.test@default:default,org.jboss.tools.common.resref.core@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.common.verification.ui@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.ide.eclipse.archives.jdt.integration@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.tools.common.el.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.doc.user@default:default,org.jboss.tools.common.test@default:defa!
ult,org.jboss.tools.common.verification.ui.test@default:defaul!
t,org.jb
oss.tools.ui.bot.ext.test@default:default,org.jboss.ide.eclipse.as.classpath.ui@default:default,org.jboss.ide.eclipse.as.classpath.core@default:default,org.jboss.ide.eclipse.archives.test@default:default,org.jboss.tools.ui.bot.ext@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.tools.common.ui@default:default,org.jboss.tools.tests.performance@default:default,org.jboss.tools.common.verification@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common.text.xml@default:default,org.jboss.ide.eclipse.archives.ui.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.internal.deltacloud.test;
+import org.jboss.tools.internal.deltacloud.test.core.client.APIDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.client.HardwareProfileDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.client.ImageDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.client.InstanceDomUnmarshallingTest;
@@ -29,6 +30,7 @@
InstanceDomUnmarshallingTest.class,
ImageDomUnmarshallingTest.class,
HardwareProfileDomUnmarshallingTest.class,
+ APIDomUnmarshallingTest.class,
RealmDomUnmarshallingTest.class})
public class DeltaCloudTestSuite {
}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.internal.deltacloud.test.core.client;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.ByteArrayInputStream;
+import java.net.MalformedURLException;
+
+import org.jboss.tools.deltacloud.core.client.API;
+import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
+import org.jboss.tools.deltacloud.core.client.unmarshal.APIUnmarshaller;
+import org.jboss.tools.internal.deltacloud.test.fakes.APIResponseFakes.APIResponse;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class APIDomUnmarshallingTest {
+
+ @Test
+ public void ec2DriverIsUnmarshalled() throws MalformedURLException, DeltaCloudClientException {
+ API api = new API();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(APIResponse.apiResponse.getBytes());
+ new APIUnmarshaller().unmarshall(inputStream, api);
+ assertNotNull(api);
+ assertEquals(APIResponse.driver, api.getDriver().name().toLowerCase());
+ }
+
+ @Test
+ public void invalidDriverUnmarshalledToUnknown() throws MalformedURLException, DeltaCloudClientException {
+ API api = new API();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(APIResponse.invalidDriverApiResponse.getBytes());
+ new APIUnmarshaller().unmarshall(inputStream, api);
+ assertNotNull(api);
+ assertEquals(Driver.UNKNOWN, api.getDriver());
+ }
+}
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java 2011-01-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -19,6 +19,7 @@
import java.util.Collections;
import java.util.List;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl;
import org.jboss.tools.deltacloud.core.client.DeltaCloudNotFoundClientException;
@@ -55,7 +56,7 @@
@Test
public void recognizesDeltaCloud() throws IOException {
- assertEquals(DeltaCloudClientImpl.DeltaCloudServerType.MOCK, testSetup.getClient().getServerType());
+ assertEquals(Driver.MOCK, testSetup.getClient().getServerType());
}
/**
@@ -75,7 +76,7 @@
serverFake.start();
try {
assertEquals(
- DeltaCloudClientImpl.DeltaCloudServerType.UNKNOWN,
+ Driver.UNKNOWN,
new DeltaCloudClientImpl(
MockIntegrationTestContext.SERVERFAKE_URL, MockIntegrationTestContext.DELTACLOUD_USER,
MockIntegrationTestContext.DELTACLOUD_PASSWORD).getServerType());
@@ -97,7 +98,7 @@
DeltaCloudClientImpl errorClient = new DeltaCloudClientImpl(MockIntegrationTestContext.DELTACLOUD_URL) {
@Override
public List<Image> listImages() throws DeltaCloudClientException {
- requestStringResponse(new DeltaCloudRequest() {
+ request(new DeltaCloudRequest() {
@Override
public URL getUrl() throws MalformedURLException {
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java 2011-01-27 10:33:01 UTC (rev 28649)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.internal.deltacloud.test.fakes;
+
+/**
+ * @author André Dietisheim
+ */
+public class APIResponseFakes {
+
+ public static class APIResponse {
+ public static final String url = "http://localhost:3001/api/keys/test1292840175447";
+ public static final String driver = "ec2";
+
+ public static final String apiResponse = getApiResponseXML(url, driver);
+ public static final String invalidDriverApiResponse = getApiResponseXML(url, "foo");
+ }
+
+ private static final String getApiResponseXML(String url, String driver) {
+ return "<api driver='" + driver + "' version='0.1'>"
+ + " <link href='" + url + "realms' rel='realms'>"
+ + " </link>"
+ + " <link href='" + url + "images' rel='images'>"
+ + " <feature name='owner_id'></feature>"
+ + " </link>"
+ + " <link href='" + url + "instance_states' rel='instance_states'>"
+ + " </link>"
+ + " <link href='" + url + "instances' rel='instances'>"
+ + " <feature name='user_data'></feature>"
+ + " <feature name='authentication_key'></feature>"
+ + " <feature name='public_ip'></feature>"
+ + " <feature name='security_group'></feature>"
+ + " </link>"
+ + " <link href='" + url + "hardware_profiles' rel='hardware_profiles'>"
+ + " </link>"
+ + " <link href='" + url + "storage_snapshots' rel='storage_snapshots'>"
+ + " </link>"
+ + " <link href='" + url + "storage_volumes' rel='storage_volumes'>"
+ + " </link>"
+ + " <link href='" + url + "keys' rel='keys'>"
+ + " </link>"
+ + " <link href='" + url + "buckets' rel='buckets'>"
+ + " <feature name='bucket_location'></feature>"
+ + " </link>"
+ + "</api>";
+
+ }
+
+}
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28648 - trunk/struts/docs/struts_tools_ref_guide.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-27 03:41:02 -0500 (Thu, 27 Jan 2011)
New Revision: 28648
Modified:
trunk/struts/docs/struts_tools_ref_guide/pom.xml
Log:
General Updates
Modified: trunk/struts/docs/struts_tools_ref_guide/pom.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/pom.xml 2011-01-27 05:27:57 UTC (rev 28647)
+++ trunk/struts/docs/struts_tools_ref_guide/pom.xml 2011-01-27 08:41:02 UTC (rev 28648)
@@ -27,7 +27,7 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.3.3</version>
+ <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<formats>
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28647 - in trunk/documentation/guides/JBDS_Release_Notes: en-US and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-27 00:27:57 -0500 (Thu, 27 Jan 2011)
New Revision: 28647
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues_4_0_0.xml
trunk/documentation/guides/JBDS_Release_Notes/exceptions.txt
Log:
General Updates
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues_4_0_0.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues_4_0_0.xml 2011-01-27 05:22:00 UTC (rev 28646)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues_4_0_0.xml 2011-01-27 05:27:57 UTC (rev 28647)
@@ -1278,9 +1278,59 @@
<title>General Issues</title>
<para>
<itemizedlist>
-
<listitem>
<para>
+ JBoss Developer Studio is certified to run on the following platforms:
+ <itemizedlist>
+ <listitem>
+ <para>Windows XP (i386 and x86_64) running 32-bit Sun JDK 6</para>
+ </listitem>
+ <listitem>
+ <para>Windows XP (i386 and x86_64) running 64-bit Sun JDK 6 (*)</para>
+ </listitem>
+ <listitem>
+ <para>MacOS X 10.6 running 32-bit Apple JDK 6</para>
+ </listitem>
+ <listitem>
+ <para>MacOS X 10.5 running 64-bit Apple JDK 6 (*)</para>
+ </listitem>
+ <listitem>
+ <para>RHEL5 i386 running 32-bit Sun JDK 6 and OpenJDK 6</para>
+ </listitem>
+ <listitem>
+ <para>RHEL5 x86_64 running 64-bit Sun JDK 6 and OpenJDK 6</para>
+ </listitem>
+ </itemizedlist>
+ </para>
+
+ <para> (*) The visual component of the Visual Page Editor is not supported in these configurations.</para>
+
+ <para>
+ The minimum requirements are:
+ <itemizedlist>
+ <listitem>
+ <para>1 GB RAM</para>
+ </listitem>
+ <listitem>
+ <para>450 MB of hard disk space for the non-EAP version</para>
+ </listitem>
+ <listitem>
+ <para>800 MB of hard disk space for the EAP version</para>
+ </listitem>
+ </itemizedlist>
+ </para>
+
+ <para>
+ The recommended requirements are:
+ <itemizedlist>
+ <listitem>
+ <para>4 GB RAM</para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<ulink url="https://issues.jboss.org/browse/TOOLSDOC-134">TOOLSDOC-134</ulink>: Common typographical conventions that were listed at the beginning of each JBoss Developer Studio book have been moved into a seperate book called Document Conventions. JBoss Developer Studio books now link to the Document Conventions book in their preface.
</para>
</listitem>
Modified: trunk/documentation/guides/JBDS_Release_Notes/exceptions.txt
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/exceptions.txt 2011-01-27 05:22:00 UTC (rev 28646)
+++ trunk/documentation/guides/JBDS_Release_Notes/exceptions.txt 2011-01-27 05:27:57 UTC (rev 28647)
@@ -25,6 +25,7 @@
NOTFOUND_JBIDE-6376
NOTFOUND_JBIDE-6293
NOTFOUND_JBIDE-5960
+NOTFOUND_JBIDE-7186
Has 'new_and_noteworthy' tag but not documented as it is a sub-task of a JIRA already in the Release Notes:
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28646 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-27 00:22:00 -0500 (Thu, 27 Jan 2011)
New Revision: 28646
Modified:
trunk/build/pom.xml
Log:
add as to ws bootstrap, flow to jbpm bootstrap, and as to deltacloud bootstrap
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2011-01-27 04:30:02 UTC (rev 28645)
+++ trunk/build/pom.xml 2011-01-27 05:22:00 UTC (rev 28646)
@@ -494,6 +494,7 @@
<modules>
<module>../tests</module>
<module>../common</module>
+ <module>../as</module>
<module>../ws</module>
</modules>
</profile>
@@ -548,6 +549,7 @@
<id>jbpm-bootstrap</id>
<modules>
<module>../tests</module>
+ <module>../flow</module>
<module>../jbpm</module>
</modules>
</profile>
@@ -573,6 +575,14 @@
</profile>
<profile>
+ <id>deltacloud-bootstrap</id>
+ <modules>
+ <module>../as</module>
+ <module>../deltacloud</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>drools</id>
<activation>
<activeByDefault>false</activeByDefault>
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28645 - trunk/jsf/docs/jsf_tools_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-26 23:30:02 -0500 (Wed, 26 Jan 2011)
New Revision: 28645
Modified:
trunk/jsf/docs/jsf_tools_ref_guide/en-US/creation_and_registration.xml
Log:
General Updates
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en-US/creation_and_registration.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en-US/creation_and_registration.xml 2011-01-27 03:54:06 UTC (rev 28644)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en-US/creation_and_registration.xml 2011-01-27 04:30:02 UTC (rev 28645)
@@ -1,364 +1,272 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="creation_and_registration">
- <?dbhtml filename="creation_and_registration.html"?>
- <chapterinfo>
- <keywordset>
- <keyword>JBoss Developer Studio</keyword>
- <keyword>Eclipse</keyword>
- <keyword>JSF Tools</keyword>
- <keyword>Java</keyword>
- <keyword>JBoss</keyword>
- </keywordset>
- </chapterinfo>
- <title>Creation and Registration</title>
-
- <section id="CreateAndRegisterACustomConverter94230">
-
- <title>Create and Register a Custom Converter</title>
-
- <para>It's also possible to create a
- custom Converter in order to specify your own converting rules. Let's look at how you can do this.</para>
-
- <para>To create and register a custom converter it's necessary to
- go through the following steps:</para>
-
- <itemizedlist>
- <listitem>
- <para>In the Project Explorer view open <emphasis>
- <property>faces-config.xml</property>
- </emphasis> and select <emphasis>
- <property>Tree</property>
- </emphasis> tab.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Converters</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_44.png" scale="80"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Select <emphasis>
- <property>Converters</property>
- </emphasis> and click on<emphasis>
- <property> Add</property>
- </emphasis> button.</para>
- </listitem>
- <listitem>
- <para>On the form type the name of your converter in the <emphasis>
- <property>Converter-id</property>
- </emphasis> field and name of the class for
- converters. After clicking <emphasis>
- <property>Finish</property>
- </emphasis> button your custom converter is
- registered under the entered name.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Add Converter Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_45.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Now you can create <emphasis role="italic">
- <property>"converter"</property>
- </emphasis> class. In the Converter section you
- should see your <emphasis>
- <property>Converter-id</property>
- </emphasis> and
- <emphasis><property>Converter-class</property>.</emphasis>
- Click on <emphasis>
- <property>Converter-class</property>
- </emphasis> to generate the source code.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Generation of Source Code for Converter Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_46.png" scale="80"
- />
- </imageobject>
- </mediaobject>
- </figure>
-
- <itemizedlist>
- <listitem>
- <para>A usual wizard for creating a Java class will appear.
- All needed fields here will be adjusted
- automatically. Just leave everything without changes
- and click <emphasis>
- <property>Finish</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>New Java Class Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_47.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>To open a converter class click again on <emphasis>
- <property>Converter-class</property>
- </emphasis> link in the Converter section.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Converter Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_48.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <para>Now you
- are able to add a business logic of converter in the
- Java editor.</para>
- </section>
-
- <section id="CreateAndRegisterACustomValidator5632">
-
- <title>Create and Register a Custom Validator</title>
-
- <para>It's also quite easy to develop your
- own custom Validators. You should perform the actions similar to the
- previous one. Go through the following steps:</para>
- <itemizedlist>
- <listitem>
- <para>In the Project Explorer view open<emphasis>
- <property> faces-config.xml</property>
- </emphasis> and select <emphasis>
- <property>Tree </property>
- </emphasis>tab.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Validator in Faces Config Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_49.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Select <emphasis>
- <property>Validators</property>
- </emphasis> and click on <emphasis>
- <property>Add </property>
- </emphasis>button.</para>
- </listitem>
- <listitem>
- <para>Type the name of your validator in the <emphasis>
- <property>Validator-id</property>
- </emphasis> field and name of the class for
- validators. After clicking <emphasis>
- <property>Finish</property>
- </emphasis> button your custom validator is
- registered under the entered name.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Adding Validator</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_50.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>Now you can create the "validator" class. </para>
- <itemizedlist>
- <listitem>
- <para>In the Validator section you can see your <emphasis>
- <property>Validator-id</property>
- </emphasis> and <emphasis>
- <property>Validator-class</property></emphasis>. To generate the source code click on <emphasis>
- <property>Validator-class</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Creating Validator Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_51.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Java class will be created automatically. Leave
- everything without changes and click <emphasis>
- <property>Finish</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>New Java Class Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_52.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>To open validator class click again on <emphasis>
- <property>Validator-Class</property>
- </emphasis> link in the Validator section. Now you
- are able to write a business logic of validator in
- the Java editor.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Converter Class Editing</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_53.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- </section>
-
- <section id="referenced_beans">
- <title>Create and Register Referenced Beans</title>
-
- <para>Creation of Referenced Beans is similar to creation of Custom
- Validator as well. To perform this, let's walk through the necessary steps.</para>
-
- <itemizedlist>
- <listitem>
- <para>In the Project Explorer view open<emphasis>
- <property> faces-config.xml</property>
- </emphasis> and select <emphasis>
- <property>Tree </property>
- </emphasis>tab.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Referenced Beans in Faces Config Editor</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_54.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Select <emphasis>
- <property>Referenced Beans</property>
- </emphasis> and click on <emphasis>
- <property>Add</property>
- </emphasis> button.</para>
- </listitem>
- <listitem>
- <para>Type in the name of your Referenced Bean and type in
- or select <emphasis>
- <property>Referenced-Bean-Class</property>
- </emphasis> by using <emphasis>
- <property>Browse</property>
- </emphasis> button.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Add Referenced Bean</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_55.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>In the Referenced Bean section you should see your <emphasis>
- <property>Referenced-Bean-Name</property>
- </emphasis> and
- <emphasis><property>Referenced-Bean-Class</property>.</emphasis>
- Click on the link to open the Java creation
- wizard.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Create Referenced Bean Class</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_56.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>Java class will be created automatically. Leave
- everything without changes and click <emphasis>
- <property>Finish</property>.
- </emphasis></para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>New Java Class Form</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_57.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- <itemizedlist>
- <listitem>
- <para>To open Referenced Bean class click again on <emphasis>
- <property>Referenced-Bean-Class</property>
- </emphasis> in the Referenced Bean section. Now you
- are able to write business logic of Referenced Bean
- in the Java editor.</para>
- </listitem>
- </itemizedlist>
- <figure>
- <title>Referenced Bean Class Editing</title>
- <mediaobject>
- <imageobject>
- <imagedata
- fileref="images/jsf_support/jsf_support_58.png"
- />
- </imageobject>
- </mediaobject>
- </figure>
- </section>
+ <?dbhtml filename="creation_and_registration.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>Eclipse</keyword>
+ <keyword>JSF Tools</keyword>
+ <keyword>Java</keyword>
+ <keyword>JBoss</keyword>
+ </keywordset>
+ </chapterinfo>
+ <title>Creation and Registration</title>
+
+ <section id="CreateAndRegisterACustomConverter94230">
+
+ <title>Create and Register a Custom Converter</title>
+
+ <para>
+ It's also possible to create a custom Converter in order to specify your own converting rules. Let's look at how you can do this.
+ </para>
+
+ <para>To create and register a custom converter it is necessary perform the following steps:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>In the Project Explorer view open the <filename>faces-config.xml</filename> file and select <guilabel>Tree</guilabel> tab.</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Converters</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_44.png" scale="80" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>Select <guilabel>Converters</guilabel> and click the <guibutton>Add</guibutton> button.</para>
+ </listitem>
+ <listitem>
+ <para>
+ On the form type the name of your converter in the <emphasis><property>Converter-id</property></emphasis> field and name of the class for converters. After clicking <guibutton>Finish</guibutton> button your custom converter is registered under the entered name.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Add Converter Form</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_45.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Now you can create a <emphasis role="italic"><property>"converter"</property></emphasis> class. In the Converter section you should see your <guilabel>Converter-id</guilabel> and <guilabel>Converter-class</guilabel>. Click on the <guilabel>Converter-Class</guilabel> link to generate the source code.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Generation of Source Code for Converter Class</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_46.png" scale="80" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ A usual wizard for creating a Java class will appear. All needed fields here will be adjusted automatically. Just leave everything without changes and click the <guibutton>Finish</guibutton> button.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>New Java Class Form</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_47.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>To open a converter class click again on the <guilabel>Converter-Class</guilabel> link in the Converter section.</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Converter Class</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_48.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Now you are able to add a business logic of converter in the Java editor.</para>
+ </section>
+
+ <section id="CreateAndRegisterACustomValidator5632">
+
+ <title>Create and Register a Custom Validator</title>
+
+ <para>
+ It is also quite easy to develop your own custom Validators. The required steps are similar to those shown previously:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>In the Project Explorer view open the <filename>faces-config.xml</filename> and select the <guilabel>Tree</guilabel> tab.</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Validator in Faces Config Editor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_49.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>Select the <guilabel>Validators</guilabel> option and click the <guibutton>Add</guibutton>button.</para>
+ </listitem>
+ <listitem>
+ <para>
+ Type the name of your validator in the <guibutton>Validator-id</guibutton> field and name of the class for validators. After clicking the <guibutton>Finish</guibutton> button your custom validator is registered under the entered name.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Adding Validator</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_50.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Now you can create the "validator" class. </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ In the Validator section you can see your <guilabel>Validator-id</guilabel> and <guilabel>Validator-class</guilabel>. To generate the source code click on <guilabel>Validator-class</guilabel>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Creating Validator Class</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_51.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>Java class will be created automatically. Leave everything without changes and click the <guibutton>Finish</guibutton>.</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>New Java Class Form</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_52.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>
+ To open the validator class click on the <guilabel>Validator-Class</guilabel> link in the Validator section. Now you are able to write a business logic of validator in the Java editor.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Converter Class Editing</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_53.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+
+ <section id="referenced_beans">
+ <title>Create and Register Referenced Beans</title>
+
+ <para>
+ The creation of Referenced Beans is similar to the creation of Custom Validators. The steps below show you the steps required to create Referenced Beans.
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>In the Project Explorer view open the <filename>faces-config.xml</filename> and select the <guilabel>Tree</guilabel> tab.</para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Referenced Beans in Faces Config Editor</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_54.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>Select the <guilabel>Referenced Beans</guilabel> option and click on the <guibutton>Add</guibutton> button.</para>
+ </listitem>
+ <listitem>
+ <para>
+ Type in the name of your Referenced Bean and type in or select the <guilabel>Referenced-Bean-Class</guilabel> value by clicking the <guibutton>Browse</guibutton> button.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Add Referenced Bean</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_55.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>
+ In the Referenced Bean section you should see your <guilabel>Referenced-Bean-Name</guilabel> and <guilabel>Referenced-Bean-Class</guilabel>. Click on the link to open the Java creation wizard.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Create Referenced Bean Class</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_56.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>
+ The Java class will be created automatically. Leave everything with their default values and click the <guibutton>Finish</guibutton> button.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>New Java Class Form</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_57.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <itemizedlist>
+ <listitem>
+ <para>
+ To open a Referenced Bean class click the <guilabel>Referenced-Bean-Class</guilabel> in the Referenced Bean section. Now you are able to write business logic of Referenced Bean in the Java editor.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <figure>
+ <title>Referenced Bean Class Editing</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_58.png" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
</chapter>
\ No newline at end of file
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r28644 - trunk/jsf/docs/jsf_tools_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-26 22:54:06 -0500 (Wed, 26 Jan 2011)
New Revision: 28644
Modified:
trunk/jsf/docs/jsf_tools_ref_guide/en-US/managed_beans.xml
Log:
General Updates
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en-US/managed_beans.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en-US/managed_beans.xml 2011-01-27 03:41:34 UTC (rev 28643)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en-US/managed_beans.xml 2011-01-27 03:54:06 UTC (rev 28644)
@@ -1,208 +1,173 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="managed_beans">
- <?dbhtml filename="managed_beans.html"?>
- <chapterinfo>
- <keywordset>
- <keyword>JBoss Developer Studio</keyword>
- <keyword>Eclipse</keyword>
- <keyword>JSF Tools</keyword>
- <keyword>Java</keyword>
- <keyword>JBoss</keyword>
- </keywordset>
- </chapterinfo>
+ <?dbhtml filename="managed_beans.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>JBoss Developer Studio</keyword>
+ <keyword>Eclipse</keyword>
+ <keyword>JSF Tools</keyword>
+ <keyword>Java</keyword>
+ <keyword>JBoss</keyword>
+ </keywordset>
+ </chapterinfo>
- <title>Managed Beans</title>
+ <title>Managed Beans</title>
- <para>There is lots of power to work with <property>managed beans</property>.</para>
- <itemizedlist>
- <listitem>
- <para>Add and generate code for new managed beans</para>
- <itemizedlist>
- <listitem>
- <para>Generate code for attributes and getter/setter methods</para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>Add existing managed beans to JSF configuration file</para>
- </listitem>
- </itemizedlist>
+ <para>JSF Tools provides a number of useful features when working with <property>managed beans</property>, such as:</para>
+ <itemizedlist>
+ <listitem>
+ <para>Adding and generating code for new managed beans</para>
+ <itemizedlist>
+ <listitem>
+ <para>Generating code for attributes and getter/setter methods</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>Adding existing managed beans to a JSF configuration file</para>
+ </listitem>
+ </itemizedlist>
- <para>Thus, in this section we will guides you through all this possibilities.</para>
+ <para>This guide will look at each of these features in more detail.</para>
- <section id="CodeGenerationForManagedBeans421">
+ <section id="CodeGenerationForManagedBeans421">
- <title>Code Generation for Managed Beans</title>
+ <title>Code Generation for Managed Beans</title>
- <para>To start, create a new managed bean in JSF configuration file editor, in the Tree
- view.</para>
- <figure>
- <title>Creation of New Managed Bean</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_34.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <note>
- <title>Note:</title>
- <para>When you define a new managed bean, make sure that <emphasis>
- <property>Generate Source Code</property>
- </emphasis> is checked as shown in the figure below.</para>
- </note>
- <figure>
- <title>New Managed Bean</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_35.png" scale="75"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>After the <emphasis role="italic">
- <property>"Java"</property>
- </emphasis> class has been generated you can open it for additional editing. There are
- two ways to open the <emphasis role="italic">
- <property>"Java"</property>
- </emphasis> class:</para>
+ <para>To begin, create a new managed bean in JSF configuration file editor using the <guilabel>Tree view</guilabel>.</para>
+ <figure>
+ <title>Creation of New Managed Bean</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_34.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <note>
+ <title>Note:</title>
+ <para>
+ When you define a new managed bean, make sure that <guilabel>Generate Source Code</guilabel> option is checked as shown in the figure below.
+ </para>
+ </note>
+ <figure>
+ <title>New Managed Bean</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_35.png" scale="75"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>After the Java class has been generated you can open it for additional editing. There are two ways to open a Java class:</para>
- <itemizedlist>
- <listitem>
- <para>click on <emphasis>
- <property>Managed-Bean-Class</property>
- </emphasis> link in the editor</para>
- </listitem>
- </itemizedlist>
- <para>or</para>
- <itemizedlist>
- <listitem>
- <para>right click the <emphasis>
- <property>managed bean</property>
- </emphasis> and select <emphasis>
- <property>Open Source</property>
- </emphasis></para>
- </listitem>
- </itemizedlist>
+ <itemizedlist>
+ <listitem>
+ <para>Click on the <guilabel>Managed-Bean-Class</guilabel> link in the editor.</para>
+ </listitem>
+ </itemizedlist>
+ <itemizedlist>
+ <listitem>
+ <para>Right click the <emphasis><property>managed bean</property> </emphasis> and select the <guimenuitem>Open Source</guimenuitem> option.
+ </para>
+ </listitem>
+ </itemizedlist>
- <figure>
- <title>Opening of Created Managed Bean</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_36.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <figure>
+ <title>Opening of Created Managed Bean</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_36.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para>The generated Java source should look as follows:</para>
+ <para>The generated Java source should look as follows:</para>
- <figure>
- <title>Java Source Code</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_37.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <figure>
+ <title>Java Source Code</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_37.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para>You can also generate source code for properties, also includes <emphasis
- role="italic">
- <property>"getter"</property>
- </emphasis> and <emphasis role="italic">
- <property>"setter"</property>
- </emphasis> methods. Right click on the bean and select <emphasis>
- <property>New > Property</property>
- </emphasis>. You will see <property>Add Property</property> dialog.</para>
- <figure>
- <title>Generation of Source Code for Properties</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_38.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>When the form is open make sure that all the check boxes are selected:</para>
- <itemizedlist>
- <listitem>
- <para>Add Java property</para>
- </listitem>
- <listitem>
- <para>Generate Getter</para>
- </listitem>
- <listitem>
- <para>Generate Setter</para>
- </listitem>
- </itemizedlist>
- <para/>
- <figure>
- <title>"Add Property" Form</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_39.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Once the generation is complete, you can open the file and see the added property with
- <emphasis role="italic">
- <property>"get"</property>
- </emphasis> and <emphasis role="italic">
- <property>"set"</property>
- </emphasis> methods:</para>
- <figure>
- <title>Generated Java Source Code for Property</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_40.png" scale="75"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Thus, we've discussed everything which comes to creating a new Managed Bean.
- The next section will show you how to add an existing Bean into a JSF configuration
- file.</para>
- </section>
- <section id="AddExistingJavaBeansToAJSFConfigurationFile74332">
+ <para>You can also generate source code for properties, also includes getter and setter methods. Right click on the bean and select <menuchoice><guimenuitem>New</guimenuitem><guimenuitem>Property</guimenuitem></menuchoice>. You will then see the <guilabel>Add Property</guilabel> dialog.</para>
+ <figure>
+ <title>Generation of Source Code for Properties</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_38.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>When the form is open make sure that all the check boxes are selected:</para>
+ <itemizedlist>
+ <listitem>
+ <para>Add Java property</para>
+ </listitem>
+ <listitem>
+ <para>Generate Getter</para>
+ </listitem>
+ <listitem>
+ <para>Generate Setter</para>
+ </listitem>
+ </itemizedlist>
+ <para/>
+ <figure>
+ <title>"Add Property" Form</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_39.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Once the generation is complete, you can open the file and see the newly added property with accompanying "get" and "set" methods:
+ </para>
+ <figure>
+ <title>Generated Java Source Code for Property</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_40.png" scale="75"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ This covers the options available when creating a new Managed Bean. The next section will show you how to add an existing Bean into a JSF configuration file.
+ </para>
+ </section>
+ <section id="AddExistingJavaBeansToAJSFConfigurationFile74332">
- <title>Add Existing Java Beans to a JSF Configuration File</title>
- <para>If you already have a Java bean you can easily add it to a <property>JSF configuration
- file</property>.</para>
- <para>You should start the same way you create a new managed bean. Use the <emphasis>
- <property>Browse...</property>
- </emphasis> button to add your existing Java class.</para>
- <figure>
- <title>New Managed Bean Form</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_42.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Once the class is set, its <emphasis>
- <property>Name</property>
- </emphasis> will be set as well. But you can easily substitute it for the other one.
- Notice that <emphasis>
- <property>Generate Source Code</property>
- </emphasis> option is not available as the <emphasis role="italic">
- <property>"Java"</property>
- </emphasis> class already exists. </para>
- <para>After adding your class <emphasis>
- <property>Next</property>
- </emphasis> button will be activated. Pressing it you'll get <emphasis>
- <property>Managed Properties</property>
- </emphasis> dialog where all corresponding properties are displayed. Check the necessary
- ones to add them into your <property>JSF Configuration File</property>.</para>
+ <title>Add Existing Java Beans to a JSF Configuration File</title>
+ <para>If you already have a Java bean you can easily add it to a <property>JSF configuration file</property>.</para>
+ <para>You should start the same way you create a new managed bean. Use the <guibutton>Browse...</guibutton> button to add your existing Java class.</para>
+ <figure>
+ <title>New Managed Bean Form</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_42.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ Once the class is set, its <guilabel>Name</guilabel> will be set as well. But you can easily substitute it for the other one. Notice that <guilabel>Generate Source Code</guilabel> option is not available as the Java class already exists.
+ </para>
+ <para>
+ After adding your class the <guibutton>Next</guibutton> button will be activated. When you click it you will be presented with the <guilabel>Managed Properties</guilabel> dialog where all corresponding properties are displayed. Checking the appropriate ones will add them into your <property>JSF Configuration File</property>.
+ </para>
- <figure>
- <title>Selection of Bean's Properties.</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_support/jsf_support_43.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <figure>
+ <title>Selection of Bean's Properties.</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_support/jsf_support_43.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para>If you don't want to add any, just click <emphasis>
- <property>Finish</property>. </emphasis></para>
- <para>Above-listed steps have demonstrated how you can specify an existing Bean in the JSF
- configuration file, i.e. <emphasis>
- <property>faces-config.xml</property>. </emphasis> In the next chapter
- you'll know how to organize and register another kind of artifacts.</para>
- </section>
+ <para>If you don't want to add any, just click the <guibutton>Finish</guibutton> button.</para>
+ <para>
+ The steps above have demonstrated how you can add an existing Bean to the JSF configuration file, i.e. <filename>faces-config.xml</filename>. The next chapter will demonstrate how to organize and register other kinds of artifacts.
+ </para>
+ </section>
</chapter>
13 years, 5 months
- 1
- 0