JBoss Tools SVN: r35128 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-28 14:33:13 -0400 (Wed, 28 Sep 2011)
New Revision: 35128
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java
Log:
[JBIDE-9591] added javadoc, cleaned API
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-28 18:27:42 UTC (rev 35127)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-28 18:33:13 UTC (rev 35128)
@@ -47,8 +47,9 @@
*
* @see ICartridge
* @see InternalUser
+ * @see IApplication
*/
- public Application createApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
+ public IApplication createApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
/**
* Destroys the application with the given name and cartridge for the given user.
@@ -75,6 +76,7 @@
*
* @see ICartridge
* @see InternalUser
+ * @see IApplication
*/
public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
@@ -89,6 +91,7 @@
*
* @see ICartridge
* @see InternalUser
+ * @see IApplication
*/
public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
@@ -104,6 +107,7 @@
*
* @see ICartridge
* @see InternalUser
+ * @see IApplication
*/
public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
@@ -127,18 +131,46 @@
*
* @param name the new domain name(-space)
* @param sshKey the ssh key that shall be used.
- * @param user
- * @return
+ * @param user the user account to use
+ * @return the domain that was changed
* @throws OpenshiftException
*
* @see ICartridge
* @see InternalUser
* @see SSHKeyPair
* @see ISSHPublicKey
+ * @see IDomain
*/
public IDomain changeDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException;
+ /**
+ * Creates a domain (namespace) with the given name for the given user account with the given ssh public key.
+ * If a domain already exists an OpenshiftEndpointException is thrown.
+ *
+ * @param name the new domain name(-space)
+ * @param sshKey the ssh key that shall be used.
+ * @param user the user account to use
+ * @return the domain that was changed
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ * @see SSHKeyPair
+ * @see ISSHPublicKey
+ * @see IDomain
+ */
public IDomain createDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException;
+ /**
+ * Returns all informations for the given user and its applications.
+ *
+ * @param user the user account to use
+ * @return all user informations (user related info and applications)
+ * @throws OpenshiftException
+ *
+ * @see InternalUser
+ * @see UserInfo
+ * @see ApplicationInfo
+ */
public UserInfo getUserInfo(InternalUser user) throws OpenshiftException;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java 2011-09-28 18:27:42 UTC (rev 35127)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/InternalUser.java 2011-09-28 18:33:13 UTC (rev 35128)
@@ -106,7 +106,7 @@
@Override
public IApplication createApplication(String name, ICartridge cartridge) throws OpenshiftException {
- Application application = service.createApplication(name, cartridge, this);
+ IApplication application = service.createApplication(name, cartridge, this);
add(application);
return application;
}
@@ -134,7 +134,7 @@
return matchingApplication;
}
- public void add(Application application) {
+ public void add(IApplication application) {
applications.add(application);
}
12 years, 8 months
JBoss Tools SVN: r35127 - in trunk/as: tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-28 14:27:42 -0400 (Wed, 28 Sep 2011)
New Revision: 35127
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationUtils.java
Log:
[JBIDE-9591] added javadoc, cleaned API
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-28 17:13:54 UTC (rev 35126)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-28 18:27:42 UTC (rev 35127)
@@ -25,20 +25,117 @@
public static final String BASE_URL = "https://openshift.redhat.com/broker";
+ /**
+ * List all cartridges that are available on the Openshift Express platform.
+ *
+ * @param user the user account that shall be used
+ * @return the list of cartridges available on the platform
+ * @throws OpenshiftException
+ *
+ * @see InternalUser
+ */
public List<ICartridge> getCartridges(InternalUser user) throws OpenshiftException;
+ /**
+ * Creates an application with the given name and cartridge for the given user.
+ *
+ * @param name the application name
+ * @param cartridge the cartridge to use
+ * @param user the user account
+ * @return the application that was created
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ */
public Application createApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
+ /**
+ * Destroys the application with the given name and cartridge for the given user.
+ *
+ * @param name the name of the application that shall be destroyed
+ * @param cartridge the cartridge that the application is running on
+ * @param user the user account
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ */
public void destroyApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
+ /**
+ * Starts the application with the given name and cartridge for the given user account.
+ * Starting an application that is already started has no effect.
+ *
+ * @param name of the application that shall be started
+ * @param cartridge the cartridge the application is running on
+ * @param user the user account to use
+ * @return the application that was started
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ */
public IApplication startApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
+ /**
+ * Restarts the application with the given name and cartridge for the given user account.
+ *
+ * @param name the name of the application that shall be restarted
+ * @param cartridge the cartridge the application is running on
+ * @param user the user account to use
+ * @return the application that was started
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ */
public IApplication restartApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
+ /**
+ * Stops the application with the given name and cartridge for the given user account. Stopping an application
+ * that is already stopped has no effect.
+ *
+ * @param name the name of the application that shall be restarted
+ * @param cartridge the cartridge the application is running on
+ * @param user the user account to use
+ * @return the application that was stopped
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ */
public IApplication stopApplication(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
+ /**
+ * Returns the log of the application with the given name and cartridge. Returns the whole log if
+ * no new log entry was created since the last call. Returns the new entries otherwise.
+ *
+ * @param name of the application that the log shall be returned of
+ * @param cartridge the cartridge the application is running on
+ * @param user the user account to use
+ * @return the log of the application
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ */
public String getStatus(String name, ICartridge cartridge, InternalUser user) throws OpenshiftException;
+ /**
+ * Changes the current domain (namespace) to the given name.
+ *
+ * @param name the new domain name(-space)
+ * @param sshKey the ssh key that shall be used.
+ * @param user
+ * @return
+ * @throws OpenshiftException
+ *
+ * @see ICartridge
+ * @see InternalUser
+ * @see SSHKeyPair
+ * @see ISSHPublicKey
+ */
public IDomain changeDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException;
public IDomain createDomain(String name, ISSHPublicKey sshKey, InternalUser user) throws OpenshiftException;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-28 17:13:54 UTC (rev 35126)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-28 18:27:42 UTC (rev 35127)
@@ -26,8 +26,8 @@
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.Application;
import org.jboss.ide.eclipse.as.openshift.core.internal.ApplicationInfo;
+import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
-import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.UserInfo;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationAction;
import org.jboss.ide.eclipse.as.openshift.core.internal.request.ApplicationRequest;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.java 2011-09-28 17:13:54 UTC (rev 35126)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.java 2011-09-28 18:27:42 UTC (rev 35127)
@@ -16,8 +16,8 @@
import java.util.List;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.User;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
-import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser;
import org.junit.Before;
import org.junit.Ignore;
@@ -30,7 +30,7 @@
private OpenshiftService openshiftService;
- private InternalUser user;
+ private User user;
@Before
public void setUp() {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java 2011-09-28 17:13:54 UTC (rev 35126)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java 2011-09-28 18:27:42 UTC (rev 35127)
@@ -25,7 +25,7 @@
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftEndpointException;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
-import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
+import org.jboss.ide.eclipse.as.openshift.core.User;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.utils.ApplicationUtils;
@@ -37,7 +37,7 @@
*/
public class UserIntegrationTest {
- private InternalUser user;
+ private User user;
@Before
public void setUp() throws OpenshiftException, DatatypeConfigurationException {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java 2011-09-28 17:13:54 UTC (rev 35126)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java 2011-09-28 18:27:42 UTC (rev 35127)
@@ -29,8 +29,8 @@
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.ApplicationInfo;
+import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
-import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.UserInfo;
import org.jboss.ide.eclipse.as.openshift.core.internal.utils.RFC822DateUtils;
import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.CartridgeResponseFake;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationUtils.java 2011-09-28 17:13:54 UTC (rev 35126)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationUtils.java 2011-09-28 18:27:42 UTC (rev 35127)
@@ -13,9 +13,9 @@
import org.jboss.ide.eclipse.as.openshift.core.Cartridge;
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+import org.jboss.ide.eclipse.as.openshift.core.User;
import org.jboss.ide.eclipse.as.openshift.core.internal.Application;
import org.jboss.ide.eclipse.as.openshift.core.internal.IOpenshiftService;
-import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
/**
* @author André Dietisheim
@@ -26,11 +26,11 @@
return String.valueOf(System.currentTimeMillis());
}
- public static Application createApplication(InternalUser user, IOpenshiftService service) throws OpenshiftException {
+ public static Application createApplication(User user, IOpenshiftService service) throws OpenshiftException {
return service.createApplication(createRandomApplicationName(), Cartridge.JBOSSAS_7, user);
}
- public static void silentlyDestroyAS7Application(String name, InternalUser user, IOpenshiftService service) {
+ public static void silentlyDestroyAS7Application(String name, User user, IOpenshiftService service) {
try {
service.destroyApplication(name, ICartridge.JBOSSAS_7, user);
} catch (OpenshiftException e) {
12 years, 8 months
JBoss Tools SVN: r35126 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-28 13:13:54 -0400 (Wed, 28 Sep 2011)
New Revision: 35126
Modified:
trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElServiceUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9753 Multiple content web roots seem to confuse VPE
removed unnecessary checks for nulls
Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2011-09-28 17:01:55 UTC (rev 35125)
+++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2011-09-28 17:13:54 UTC (rev 35126)
@@ -60,7 +60,7 @@
/**
* Returns all resources for current file
* @param file
- * @return
+ * @return <code>ResourceReference</code> array that might be empty, never returns <code>null</code>
*/
public ResourceReference[] getAllResources(IFile file) {
Set<String> locations = new HashSet<String>();
@@ -338,7 +338,12 @@
}
}
}
-
+
+ /**
+ *
+ * @param path
+ * @return <code>ResourceReference</code> array that might be empty, never returns <code>null</code>
+ */
public ResourceReference[] getAllResources(IPath path) {
Set locations = new HashSet();
List css = new ArrayList();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElServiceUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElServiceUtil.java 2011-09-28 17:01:55 UTC (rev 35125)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElServiceUtil.java 2011-09-28 17:13:54 UTC (rev 35126)
@@ -74,14 +74,14 @@
final ResourceReference[] gResources = GlobalELReferenceList.getInstance().getAllResources(workspacePath);
final ResourceReference[] elResources = ELReferenceList.getInstance().getAllResources(resourceFile);
- int size = (gResources == null ? 0 : gResources.length);
- size += (elResources == null ? 0 : elResources.length);
+ int size = gResources.length;
+ size += elResources.length;
ResourceReference[] rst = new ResourceReference[size];
- if ((gResources != null) && (gResources.length > 0)) {
+ if (gResources.length > 0) {
System.arraycopy(gResources, 0, rst, 0, gResources.length);
}
- if ((elResources != null) && (elResources.length > 0)) {
+ if (elResources.length > 0) {
System.arraycopy(elResources, 0, rst, gResources == null ? 0 : gResources.length, elResources.length);
}
return rst;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-09-28 17:01:55 UTC (rev 35125)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-09-28 17:13:54 UTC (rev 35126)
@@ -196,7 +196,7 @@
IResource resource = ((JavaElement)fragmentRoot).resource();
if(resource instanceof IContainer && resource.exists()) {
IFile f = ((IContainer)resource).getFile(new Path(classPathResource));
- if(f != null && f.exists()) {
+ if(f.exists()) {
result = f.getLocation().toFile().getAbsolutePath();
}
}
@@ -243,7 +243,7 @@
if (fileName.startsWith("/")) { //$NON-NLS-1$
ResourceReference[] resources = AbsoluteFolderReferenceList
.getInstance().getAllResources(includeFile);
- if (resources != null && resources.length == 1) {
+ if (resources.length == 1) {
String location = resources[0].getLocation() + fileName;
IPath path = new Path(location);
file = ResourcesPlugin.getWorkspace().getRoot()
@@ -252,7 +252,7 @@
//WebArtifactEdit edit = WebArtifactEdit
// .getWebArtifactEditForRead(includeFile.getProject());
IContainer[] webRootFolders = WebUtils.getWebRootFolders(includeFile.getProject());
- if (webRootFolders != null) {
+ if (webRootFolders.length > 0) {
for (IContainer webRootFolder : webRootFolders) {
IFile handle = webRootFolder.getFile(new Path(fileName));
if (handle.exists()) {
@@ -270,7 +270,7 @@
} else {
ResourceReference[] resources = RelativeFolderReferenceList
.getInstance().getAllResources(includeFile);
- if ((resources != null) && resources.length == 1) {
+ if (resources.length == 1) {
String location = resources[0].getLocation() + File.separator
+ fileName;
IPath path = new Path(location);
@@ -291,7 +291,7 @@
IContainer[] webRootFolders = WebUtils.getWebRootFolders(project);
IPath defaultWebRootPath = null;
- if (webRootFolders != null && webRootFolders.length > 0) {
+ if (webRootFolders.length > 0) {
defaultWebRootPath = webRootFolders[0].getFullPath();
}
if (defaultWebRootPath == null) {
12 years, 8 months
JBoss Tools SVN: r35125 - trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-28 13:01:55 -0400 (Wed, 28 Sep 2011)
New Revision: 35125
Modified:
trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java
Log:
fixed toArray calls to use actual collection size for target archive
Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2011-09-28 16:56:31 UTC (rev 35124)
+++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2011-09-28 17:01:55 UTC (rev 35125)
@@ -95,7 +95,7 @@
locations.add(dcss[i]);
css.add(ref);
}
- return css.toArray(new ResourceReference[0]);
+ return css.toArray(new ResourceReference[css.size()]);
}
private String[] getDeclaredResources(IResource resource) {
@@ -371,7 +371,7 @@
locations.add(dcss[i]);
css.add(ref);
}
- return (ResourceReference[])css.toArray(new ResourceReference[0]);
+ return (ResourceReference[])css.toArray(new ResourceReference[css.size()]);
}
private String[] getDeclaredResources(IPath path) {
12 years, 8 months
JBoss Tools SVN: r35124 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-28 12:56:31 -0400 (Wed, 28 Sep 2011)
New Revision: 35124
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
Log:
We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java 2011-09-28 16:54:00 UTC (rev 35123)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java 2011-09-28 16:56:31 UTC (rev 35124)
@@ -1,12 +1,13 @@
package org.jboss.tools.cdi.core.test;
+import junit.framework.TestCase;
+
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.internal.core.impl.BeanField;
import org.jboss.tools.cdi.internal.core.impl.BeanMethod;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
-import org.jboss.tools.cdi.internal.core.impl.EventBean;
import org.jboss.tools.cdi.internal.core.impl.InjectionPointField;
import org.jboss.tools.cdi.internal.core.impl.InjectionPointParameter;
import org.jboss.tools.cdi.internal.core.impl.InterceptorBindingElement;
@@ -14,8 +15,6 @@
import org.jboss.tools.cdi.internal.core.impl.ScopeElement;
import org.jboss.tools.cdi.internal.core.impl.StereotypeElement;
-import junit.framework.TestCase;
-
public class CDIImagesTest extends TestCase {
public CDIImagesTest(){
}
12 years, 8 months
JBoss Tools SVN: r35123 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-28 12:54:00 -0400 (Wed, 28 Sep 2011)
New Revision: 35123
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-28 16:41:16 UTC (rev 35122)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-28 16:54:00 UTC (rev 35123)
@@ -78,6 +78,7 @@
ValidationExceptionTest.initLogger();
TestSuite suiteAll = new TestSuite("CDI Core Tests");
+ suiteAll.addTestSuite(CDIImagesTest.class);
suiteAll.addTestSuite(TypeTest.class);
TestSuite suite = new TestSuite("TCK Tests");
suite.addTestSuite(ResolutionByNameTest.class);
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java 2011-09-28 16:54:00 UTC (rev 35123)
@@ -0,0 +1,77 @@
+package org.jboss.tools.cdi.core.test;
+
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.cdi.core.CDIImages;
+import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.internal.core.impl.BeanField;
+import org.jboss.tools.cdi.internal.core.impl.BeanMethod;
+import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.cdi.internal.core.impl.EventBean;
+import org.jboss.tools.cdi.internal.core.impl.InjectionPointField;
+import org.jboss.tools.cdi.internal.core.impl.InjectionPointParameter;
+import org.jboss.tools.cdi.internal.core.impl.InterceptorBindingElement;
+import org.jboss.tools.cdi.internal.core.impl.QualifierElement;
+import org.jboss.tools.cdi.internal.core.impl.ScopeElement;
+import org.jboss.tools.cdi.internal.core.impl.StereotypeElement;
+
+import junit.framework.TestCase;
+
+public class CDIImagesTest extends TestCase {
+ public CDIImagesTest(){
+ }
+
+ public void checkImageForCDIElement(ICDIElement element){
+ assertNotNull("CDI Element must be not null", element);
+
+ Image image = CDIImages.getImageByElement(element);
+
+ assertNotNull("Icon image for CDI element - "+element.getClass()+" not loaded", image);
+
+ assertTrue("Icon image for CDI element - "+element.getClass()+" not found", image != CDIImages.WELD_IMAGE);
+ }
+
+ public void testImageForBeanClass(){
+ ClassBean element = new ClassBean();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForInjectionPointField(){
+ InjectionPointField element = new InjectionPointField();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForInjectionPointParameter(){
+ InjectionPointParameter element = new InjectionPointParameter();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForStereotype(){
+ StereotypeElement element = new StereotypeElement();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForInterceptorBinding(){
+ InterceptorBindingElement element = new InterceptorBindingElement();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForQualifier(){
+ QualifierElement element = new QualifierElement();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForScope(){
+ ScopeElement element = new ScopeElement();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForBeanMethod(){
+ BeanMethod element = new BeanMethod();
+ checkImageForCDIElement(element);
+ }
+
+ public void testImageForBeanField(){
+ BeanField element = new BeanField();
+ checkImageForCDIElement(element);
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r35122 - trunk/site.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-28 12:41:16 -0400 (Wed, 28 Sep 2011)
New Revision: 35122
Modified:
trunk/site/site.xml
Log:
JBIDE-9784 Include JBoss Central to JBoss Tools
Modified: trunk/site/site.xml
===================================================================
--- trunk/site/site.xml 2011-09-28 16:25:44 UTC (rev 35121)
+++ trunk/site/site.xml 2011-09-28 16:41:16 UTC (rev 35122)
@@ -24,6 +24,7 @@
<feature url="features/org.drools.eclipse.task.feature_0.0.0.jar" id="org.drools.eclipse.task.feature" version="0.0.0" />
<feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0" />
+ <feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.project.central.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0" />
<feature url="features/org.jboss.tools.maven.feature_0.0.0.jar" id="org.jboss.tools.maven.feature" version="0.0.0" />
12 years, 8 months
JBoss Tools SVN: r35121 - in trunk/as: plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-28 12:25:44 -0400 (Wed, 28 Sep 2011)
New Revision: 35121
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
Log:
[JBIDE-9773] added integration test for "create a domain when a domain already exists" & Corrected service implementation
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-28 16:10:48 UTC (rev 35120)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-28 16:25:44 UTC (rev 35121)
@@ -127,9 +127,9 @@
new DomainResponseUnmarshaller(request.getName(), user).unmarshall(responseString);
return response.getOpenshiftObject();
} catch (MalformedURLException e) {
- throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url);
+ throw new OpenshiftEndpointException(url, e, "Could reach openshift platform at \"{0}\"", url);
} catch (HttpClientException e) {
- throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url);
+ throw new OpenshiftEndpointException(url, e, "Could not {0}", request.toHumanReadable());
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java 2011-09-28 16:10:48 UTC (rev 35120)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java 2011-09-28 16:25:44 UTC (rev 35121)
@@ -45,4 +45,6 @@
}
public abstract boolean isAlter();
+
+ public abstract String toHumanReadable();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java 2011-09-28 16:10:48 UTC (rev 35120)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java 2011-09-28 16:25:44 UTC (rev 35121)
@@ -29,4 +29,9 @@
public boolean isAlter() {
return true;
}
+
+ @Override
+ public String toHumanReadable() {
+ return "change domain to " + getName();
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java 2011-09-28 16:10:48 UTC (rev 35120)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java 2011-09-28 16:25:44 UTC (rev 35121)
@@ -29,4 +29,10 @@
public boolean isAlter() {
return false;
}
+
+ @Override
+ public String toHumanReadable() {
+ return "create domain " + getName();
+ }
+
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java 2011-09-28 16:10:48 UTC (rev 35120)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java 2011-09-28 16:25:44 UTC (rev 35121)
@@ -23,6 +23,7 @@
import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
import org.jboss.ide.eclipse.as.openshift.core.IDomain;
import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftEndpointException;
import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
@@ -68,6 +69,15 @@
assertTrue(domain.getNamespace().length() > 0);
}
+ @Test(expected=OpenshiftEndpointException.class)
+ public void cannotCreateDomainIfAlreadyExists() throws OpenshiftException {
+ IDomain domain = user.getDomain();
+ assertNotNull(domain);
+ ISSHPublicKey key = user.getSshKey();
+ assertNotNull(key);
+ user.createDomain("newDomain", key);
+ }
+
@Test
public void canGetCartridges() throws OpenshiftException {
Collection<ICartridge> cartridges = user.getCartridges();
12 years, 8 months
JBoss Tools SVN: r35120 - in trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core: utils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-28 12:10:48 -0400 (Wed, 28 Sep 2011)
New Revision: 35120
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java
Log:
[JBIDE-9773] added user integration test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java 2011-09-28 15:59:40 UTC (rev 35119)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/OpenshiftIntegrationTestSuite.java 2011-09-28 16:10:48 UTC (rev 35120)
@@ -21,7 +21,8 @@
CartridgesIntegrationTest.class,
DomainIntegrationTest.class,
ListCartridgesIntegrationTest.class,
- UserInfoIntegrationTest.class
+ UserInfoIntegrationTest.class,
+ UserIntegrationTest.class
})
/**
* @author André Dietisheim
Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java 2011-09-28 16:10:48 UTC (rev 35120)
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.ide.eclipse.as.openshift.test.internal.core;
+
+import static org.jboss.ide.eclipse.as.openshift.test.internal.core.utils.ApplicationAsserts.assertApplication;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+
+import org.jboss.ide.eclipse.as.openshift.core.IApplication;
+import org.jboss.ide.eclipse.as.openshift.core.ICartridge;
+import org.jboss.ide.eclipse.as.openshift.core.IDomain;
+import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
+import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException;
+import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser;
+import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService;
+import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser;
+import org.jboss.ide.eclipse.as.openshift.test.internal.core.utils.ApplicationUtils;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class UserIntegrationTest {
+
+ private InternalUser user;
+
+ @Before
+ public void setUp() throws OpenshiftException, DatatypeConfigurationException {
+ this.user = new TestUser();
+ }
+
+ @Test
+ public void canGetUserUUID() throws OpenshiftException {
+ String uuid = user.getUUID();
+ assertNotNull(uuid);
+ assertTrue(uuid.length() > 0);
+ }
+
+ @Test
+ public void canGetPublicKey() throws OpenshiftException {
+ ISSHPublicKey key = user.getSshKey();
+ assertNotNull(key);
+ assertNotNull(key.getPublicKey());
+ assertTrue(key.getPublicKey().length() > 0);
+ }
+
+ @Test
+ public void canGetDomain() throws OpenshiftException {
+ IDomain domain = user.getDomain();
+ assertNotNull(domain);
+ assertNotNull(domain.getRhcDomain());
+ assertTrue(domain.getRhcDomain().length() > 0);
+ assertNotNull(domain.getNamespace());
+ assertTrue(domain.getNamespace().length() > 0);
+ }
+
+ @Test
+ public void canGetCartridges() throws OpenshiftException {
+ Collection<ICartridge> cartridges = user.getCartridges();
+ assertNotNull(cartridges);
+ assertTrue(cartridges.size() >= 5);
+ }
+
+ @Test
+ public void canGetApplications() throws OpenshiftException {
+ Collection<IApplication> applications = user.getApplications();
+ assertNotNull(applications);
+ }
+
+ @Test
+ public void canCreateApplication() throws OpenshiftException {
+ String applicationName = ApplicationUtils.createRandomApplicationName();
+ try {
+ Collection<IApplication> applications = user.getApplications();
+ assertNotNull(applications);
+ int numOfApplications = applications.size();
+ IApplication application = user.createApplication(applicationName, ICartridge.JBOSSAS_7);
+ assertEquals(numOfApplications + 1, applications.size());
+ assertApplication(applicationName, ICartridge.JBOSSAS_7.getName(), application);
+ } finally {
+ ApplicationUtils.silentlyDestroyAS7Application(applicationName, user, new OpenshiftService());
+ }
+ }
+
+ @Test
+ public void canGetApplicationByName() throws OpenshiftException, DatatypeConfigurationException {
+ String applicationName = ApplicationUtils.createRandomApplicationName();
+ try {
+ IApplication application = user.createApplication(applicationName, ICartridge.JBOSSAS_7);
+ IApplication applicationFound = user.getApplicationByName(applicationName);
+ assertNotNull(applicationFound);
+ assertEquals(application, applicationFound);
+ } finally {
+ ApplicationUtils.silentlyDestroyAS7Application(applicationName, user, new OpenshiftService());
+ }
+ }
+}
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java 2011-09-28 15:59:40 UTC (rev 35119)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java 2011-09-28 16:10:48 UTC (rev 35120)
@@ -72,8 +72,6 @@
assertNotNull(application);
assertEquals(embedded, application.getEmbedded());
assertEquals(uuid, application.getUUID());
- assertNotNull(application.getCartridge());
- assertEquals(cartridgeName, application.getCartridge().getName());
try {
assertEquals(RFC822DateUtils.getDate(creationTime), application.getCreationTime());
} catch (DatatypeConfigurationException e) {
@@ -81,6 +79,12 @@
}
}
+ public static void assertApplication(String name, String cartridgeName, IApplication application) throws OpenshiftException {
+ assertNotNull(application);
+ assertNotNull(application.getCartridge());
+ assertEquals(cartridgeName, application.getCartridge().getName());
+ }
+
public static void assertGitUri(String applicationName, String gitUri) {
Matcher matcher = GIT_URI_REGEXP.matcher(gitUri);
assertTrue(matcher.matches());
12 years, 8 months
JBoss Tools SVN: r35119 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-28 11:59:40 -0400 (Wed, 28 Sep 2011)
New Revision: 35119
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
Log:
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-28 15:33:59 UTC (rev 35118)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-28 15:59:40 UTC (rev 35119)
@@ -75,10 +75,10 @@
return response.getOpenshiftObject();
} catch (MalformedURLException e) {
throw new OpenshiftEndpointException(
- url, e, "Could not get InternalUser info for InternalUser \"{0}\" at \"{1}\"", user.getRhlogin(), url, e);
+ url, e, "Could not get user info for user \"{0}\" at \"{1}\"", user.getRhlogin(), url, e);
} catch (HttpClientException e) {
throw new OpenshiftEndpointException(
- url, e, "Could not get InternalUser info for InternalUser \"{0}\" at \"{1}\"", user.getRhlogin(), url, e);
+ url, e, "Could not get user info for user \"{0}\" at \"{1}\"", user.getRhlogin(), url, e);
}
}
@@ -187,7 +187,7 @@
} catch (UnauthorizedException e) {
throw new InvalidCredentialsOpenshiftException(
url, e,
- "Could not {0} application \"{1}\" at \"{2}\": Invalid credentials InternalUser \"{3}\", password \"{4}\"",
+ "Could not {0} application \"{1}\" at \"{2}\": Invalid credentials user \"{3}\", password \"{4}\"",
applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url,
user.getRhlogin(), user.getPassword());
} catch (HttpClientException e) {
@@ -218,7 +218,7 @@
} catch (UnauthorizedException e) {
throw new InvalidCredentialsOpenshiftException(
url, e,
- "Could not {0} application \"{1}\" at \"{2}\": Invalid credentials InternalUser \"{3}\", password \"{4}\"",
+ "Could not {0} application \"{1}\" at \"{2}\": Invalid credentials user \"{3}\", password \"{4}\"",
applicationRequest.getAction().toHumanReadable(), applicationRequest.getName(), url,
user.getRhlogin(),
user.getPassword());
12 years, 8 months