JBoss Tools SVN: r39497 - in trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test: smoke and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-03-14 07:25:22 -0400 (Wed, 14 Mar 2012)
New Revision: 39497
Modified:
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java
Log:
Fixed waiting before run tests
Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2012-03-14 11:24:19 UTC (rev 39496)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2012-03-14 11:25:22 UTC (rev 39497)
@@ -51,8 +51,10 @@
ManageDroolsRules.class,
DroolsRulesEditorTest.class,
// GuidedDroolsRulesEditorTest.class,
- DomainSpecificLanguageEditorTest.class, RuleFlowTest.class,
- DecisionTableTest.class, GuvnorRepositoriesTest.class,
+ DomainSpecificLanguageEditorTest.class,
+ RuleFlowTest.class,
+ DecisionTableTest.class,
+ GuvnorRepositoriesTest.class,
DroolsViewsTest.class
})
public class DroolsAllBotTests extends SWTTestExt {
Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-03-14 11:24:19 UTC (rev 39496)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-03-14 11:25:22 UTC (rev 39497)
@@ -65,9 +65,15 @@
}
}
- while (eclipse.isDebugging() && !eclipse.isSuspendedAtBreakpoint()) {
- bot.sleep(Timing.time2S());
+ // waits for running debugging
+ while (!eclipse.isDebugging()) {
+ bot.sleep(Timing.time500MS());
}
+ // waits for stopping at breakpoint
+ while (!eclipse.isSuspendedAtBreakpoint()) {
+ bot.sleep(Timing.time1S());
+ }
+
isFirstTimeRun = false;
}
12 years, 8 months
JBoss Tools SVN: r39496 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-03-14 07:24:19 -0400 (Wed, 14 Mar 2012)
New Revision: 39496
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
Log:
Fixed isSuspendedAtBreakpoint method
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-03-14 10:57:35 UTC (rev 39495)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-03-14 11:24:19 UTC (rev 39496)
@@ -1689,8 +1689,7 @@
* <code>false</code> otherwise
*/
public boolean isSuspendedAtBreakpoint() {
- return (!bot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.SUSPEND).isEnabled()
- && bot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.TERMINATE).isEnabled());
+ return bot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.MENU_STEP_OVER).isEnabled();
}
/**
@@ -1701,7 +1700,7 @@
if (stepOverMenu.isEnabled()) {
stepOverMenu.click();
} else {
- log.info("It is not possible to step over. (Step Over menu is disabled)");
+ log.warn("It is not possible to step over. (Step Over menu is disabled)");
}
}
12 years, 8 months
JBoss Tools SVN: r39495 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-14 06:57:35 -0400 (Wed, 14 Mar 2012)
New Revision: 39495
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
Default runtime download set to AS 7.1.0 for all archetypes
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-03-14 10:44:56 UTC (rev 39494)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-03-14 10:57:35 UTC (rev 39495)
@@ -21,7 +21,7 @@
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
<property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -77,7 +77,7 @@
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
<property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -246,7 +246,7 @@
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
<property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -298,7 +298,7 @@
<fix type="wtpruntime">
<property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
<property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
12 years, 8 months
JBoss Tools SVN: r39493 - in workspace/fred/repositories/snapshot/org/jboss/errai/archetypes: archetypes-parent and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-14 06:40:56 -0400 (Wed, 14 Mar 2012)
New Revision: 39493
Added:
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/archetypes-parent/
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/archetypes-parent/2.0-SNAPSHOT/
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/archetypes-parent/2.0-SNAPSHOT/archetypes-parent-2.0-SNAPSHOT.pom
Modified:
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0-SNAPSHOT/kitchensink-quickstart-2.0-SNAPSHOT.jar
Log:
Change Errai Archetype alternative, changing README and <warName>
Added: workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/archetypes-parent/2.0-SNAPSHOT/archetypes-parent-2.0-SNAPSHOT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/archetypes-parent/2.0-SNAPSHOT/archetypes-parent-2.0-SNAPSHOT.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/archetypes-parent/2.0-SNAPSHOT/archetypes-parent-2.0-SNAPSHOT.pom 2012-03-14 10:40:56 UTC (rev 39493)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.errai.archetypes</groupId>
+ <artifactId>archetypes-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Errai Archetypes</name>
+
+ <url>http://jboss.org/errai/errai</url>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <description>
+ A GWT framework
+ </description>
+
+ <developers>
+ <developer>
+ <name>Mike Brock</name>
+ </developer>
+ <developer>
+ <name>Christian Sadilek</name>
+ </developer>
+ <developer>
+ <name>Heiko Braun</name>
+ </developer>
+ </developers>
+
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <!-- IssueManagement -->
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.jboss.org/jira/browse/ERRAI</url>
+ </issueManagement>
+
+ <modules>
+ <module>bus-quickstart</module>
+ <module>cdi-quickstart</module>
+ <module>jaxrs-quickstart</module>
+ </modules>
+
+ <scm>
+ <connection>scm:git:git@github.com:errai/archetypes.git</connection>
+ <developerConnection>scm:git:git@github.com:errai/archetypes.git</developerConnection>
+ <url>scm:git:git@github.com:errai/archetypes.git</url>
+ </scm>
+
+ <distributionManagement>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+ </repository>
+
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <!-- Specifies which version of Errai the generated project will depend on. See readme.txt for details -->
+ <errai.target.version>${project.version}</errai.target.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <escapeString>\</escapeString>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Modified: workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0-SNAPSHOT/kitchensink-quickstart-2.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years, 8 months
JBoss Tools SVN: r39492 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-14 05:41:32 -0400 (Wed, 14 Mar 2012)
New Revision: 39492
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF/MANIFEST.MF
Log:
removed cheatsheet required bundle
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF/MANIFEST.MF 2012-03-14 09:40:56 UTC (rev 39491)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF/MANIFEST.MF 2012-03-14 09:41:32 UTC (rev 39492)
@@ -16,7 +16,6 @@
org.junit4;bundle-version="4.8.1",
org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
org.hamcrest;bundle-version="1.1.0",
- org.eclipse.ui.forms;bundle-version="3.5.0",
- org.jboss.tools.project.examples.cheatsheet;bundle-version="1.2.1"
+ org.eclipse.ui.forms;bundle-version="3.5.0"
Import-Package: org.eclipse.core.runtime.adaptor,
org.eclipse.jst.j2ee.internal.plugin
12 years, 8 months
JBoss Tools SVN: r39491 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: compatibility and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-03-14 05:40:56 -0400 (Wed, 14 Mar 2012)
New Revision: 39491
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java
Log:
Run compatibility test but only on EPP 5x
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-03-14 09:22:31 UTC (rev 39490)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-03-14 09:40:56 UTC (rev 39491)
@@ -1,5 +1,6 @@
package org.jboss.tools.portlet.ui.bot.test;
+import org.jboss.tools.portlet.ui.bot.test.compatibility.JBDS4vs5Compatibility;
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject;
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletRuntime4x;
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletRuntime5x;
@@ -47,6 +48,7 @@
JSFPortletExampleRuntime5x.class,
RichFacesPortletExampleRuntime5x.class,
SeamPortletExampleRuntime5x.class,
+ JBDS4vs5Compatibility.class,
StopServer.class
})
public class AllTestsSuite {
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java 2012-03-14 09:22:31 UTC (rev 39490)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java 2012-03-14 09:40:56 UTC (rev 39491)
@@ -22,7 +22,7 @@
* @author Lucia Jelinkova
*
*/
-@Require(server=@Server(version="5.0", operator=">", state=ServerState.Present), db=@DB, seam=@Seam)
+@Require(server=@Server(version="5.1", operator=">", state=ServerState.Present), db=@DB, seam=@Seam)
public class JBDS4vs5Compatibility extends SWTTaskBasedTestCase {
private static final String ZIP_FILE = "resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip";
12 years, 8 months
JBoss Tools SVN: r39490 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-14 05:22:31 -0400 (Wed, 14 Mar 2012)
New Revision: 39490
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
Log:
/JBIDE-10461 - adding a place servers can verify their structure, cleaned up some strings, etc
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -101,6 +101,11 @@
public static String ServerStatePollerUnexpectedError;
public static String ServerArgsParseError;
+ public static String ServerMissingRuntime;
+ public static String RuntimeFolderDoesNotExist;
+ public static String JBossConfigurationFolderDoesNotExist;
+ public static String JBossAS7ConfigurationFileDoesNotExist;
+
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2012-03-14 09:22:31 UTC (rev 39490)
@@ -79,4 +79,9 @@
ErrorDisposingLocalJBoss7BehaviorDelegate=Could not dispose LocalJBoss7BehaviorDelegate
JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}"
ServerStatePollerUnexpectedError=The server state poller had an unexpected error.
-ServerArgsParseError=Error parsing server arguments: {0}
\ No newline at end of file
+ServerArgsParseError=Error parsing server arguments: {0}
+
+ServerMissingRuntime=Server {0} has no designated runtime.
+RuntimeFolderDoesNotExist=The server's runtime folder does not exist: {0}
+JBossConfigurationFolderDoesNotExist=The server's configuration folder does not exist: {0}
+JBossAS7ConfigurationFileDoesNotExist=The server's configuration file does not exist: {0}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -15,6 +15,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerAttributes;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS710ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS7ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
@@ -23,11 +24,16 @@
public class ExtendedServerPropertiesAdapterFactory implements IAdapterFactory, IJBossToolingConstants {
- public static JBossExtendedProperties getJBossExtendedProperties(IServer server) {
+ public static JBossExtendedProperties getJBossExtendedProperties(IServerAttributes server) {
Object ret = new ExtendedServerPropertiesAdapterFactory().getAdapter(server, ServerExtendedProperties.class);
return ret instanceof JBossExtendedProperties ? (JBossExtendedProperties)ret : null;
}
-
+
+ public static ServerExtendedProperties getServerExtendedProperties(IServerAttributes server) {
+ Object ret = new ExtendedServerPropertiesAdapterFactory().getAdapter(server, ServerExtendedProperties.class);
+ return (ServerExtendedProperties)ret;
+ }
+
@Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
if( adapterType != ServerExtendedProperties.class )
@@ -35,8 +41,8 @@
String typeId = null;
IServer s = null;
IRuntime r = null;
- if( adaptableObject instanceof IServer ) {
- typeId = ((IServer)adaptableObject).getServerType().getId();
+ if( adaptableObject instanceof IServerAttributes ) {
+ typeId = ((IServerAttributes)adaptableObject).getServerType().getId();
s = (IServer)adaptableObject;
} else if( adaptableObject instanceof IRuntime ) {
typeId = ((IRuntime)adaptableObject).getRuntimeType().getId();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossAS7ExtendedProperties.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -10,7 +10,14 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.server.core.IRuntime;
+import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7ServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
/**
*
@@ -21,7 +28,7 @@
}
public String getNewFilesetDefaultRootFolder() {
- return "standalone/configuration"; //$NON-NLS-1$
+ return IJBossRuntimeResourceConstants.AS7_STANDALONE + "/" + IJBossRuntimeResourceConstants.CONFIGURATION; //$NON-NLS-1$
}
public int getJMXProviderType() {
@@ -38,4 +45,19 @@
return DEPLOYMENT_SCANNER_AS7_MANAGEMENT_SUPPORT;
}
+ public String getVerifyStructureErrorMessage() throws CoreException {
+ if( server.getRuntime() == null )
+ return NLS.bind(Messages.ServerMissingRuntime, server.getName());
+ if( !server.getRuntime().getLocation().toFile().exists())
+ return NLS.bind(Messages.RuntimeFolderDoesNotExist, server.getRuntime().getLocation().toOSString());
+ IRuntime rt = server.getRuntime();
+ LocalJBoss7ServerRuntime rt2 = (LocalJBoss7ServerRuntime)rt.loadAdapter(LocalJBoss7ServerRuntime.class, null);
+ String cfile = rt2.getConfigurationFile();
+ IPath cFilePath = rt.getLocation().append(IJBossRuntimeResourceConstants.AS7_STANDALONE)
+ .append(IJBossRuntimeResourceConstants.CONFIGURATION).append(cfile);
+ if( !cFilePath.toFile().exists())
+ return NLS.bind(Messages.JBossAS7ConfigurationFileDoesNotExist, cFilePath.toOSString());
+ return null;
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -10,10 +10,16 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
+import java.io.File;
import java.text.MessageFormat;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -74,4 +80,26 @@
return DEPLOYMENT_SCANNER_JMX_SUPPORT;
}
+ public IStatus verifyServerStructure() {
+ try {
+ String e = getVerifyStructureErrorMessage();
+ if( e != null )
+ return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e);
+ } catch(CoreException ce ) {
+ return ce.getStatus();
+ }
+ return Status.OK_STATUS;
+ }
+
+ protected String getVerifyStructureErrorMessage() throws CoreException{
+ if( server.getRuntime() == null )
+ return NLS.bind(Messages.ServerMissingRuntime, server.getName());
+ if( !server.getRuntime().getLocation().toFile().exists())
+ return NLS.bind(Messages.RuntimeFolderDoesNotExist, server.getRuntime().getLocation().toOSString());
+ JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
+ if( !new File(jbossServer.getConfigDirectory()).exists())
+ return NLS.bind(Messages.JBossConfigurationFolderDoesNotExist, jbossServer.getConfigDirectory());
+ return null;
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -1,14 +1,17 @@
package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerAttributes;
public class ServerExtendedProperties {
- protected IServer server;
+ protected IServerAttributes server;
protected IRuntime runtime;
public ServerExtendedProperties(IAdaptable adaptable) {
- if( adaptable instanceof IServer) {
+ if( adaptable instanceof IServerAttributes) {
this.server = (IServer)adaptable;
this.runtime = server.getRuntime();
} else if( adaptable instanceof IRuntime){
@@ -43,4 +46,8 @@
public int getMultipleDeployFolderSupport() {
return DEPLOYMENT_SCANNER_NO_SUPPORT;
}
+
+ public IStatus verifyServerStructure() {
+ return Status.OK_STATUS;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -36,6 +36,8 @@
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
@@ -62,11 +64,11 @@
return false;
}
- if( jbsBehavior.getServer().getRuntime() == null || jbsBehavior.getServer().getRuntime().getLocation() == null
- || !jbsBehavior.getServer().getRuntime().getLocation().toFile().exists()) {
+ JBossExtendedProperties props = ExtendedServerPropertiesAdapterFactory.getJBossExtendedProperties(jbsBehavior.getServer());
+ IStatus status = props.verifyServerStructure();
+ if( !status.isOK() ) {
jbsBehavior.setServerStopped();
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- "The server's runtime folder does not exist: " + jbsBehavior.getServer().getRuntime().getLocation())); //$NON-NLS-1$
+ throw new CoreException(status);
}
Trace.trace(Trace.STRING_FINEST, "Checking if similar server is already up on the same ports."); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -25,6 +25,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerAttributes;
import org.eclipse.wst.server.core.internal.Server;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
@@ -55,11 +56,11 @@
return BehaviourModel.getPublishMethodType(server, defaultType);
}
- public static String getCurrentDeploymentMethodTypeId(IServer server) {
+ public static String getCurrentDeploymentMethodTypeId(IServerAttributes server) {
return getCurrentDeploymentMethodTypeId(server, null);
}
- public static String getCurrentDeploymentMethodTypeId(IServer server, String defaultType) {
+ public static String getCurrentDeploymentMethodTypeId(IServerAttributes server, String defaultType) {
return server.getAttribute(IDeployableServer.SERVER_MODE, defaultType);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -55,7 +55,7 @@
}
@SuppressWarnings("unchecked")
- public static <ADAPTER> ADAPTER checkedGetServerAdapter(IServer server, Class<ADAPTER> behaviorClass) throws CoreException {
+ public static <ADAPTER> ADAPTER checkedGetServerAdapter(IServerAttributes server, Class<ADAPTER> behaviorClass) throws CoreException {
ADAPTER adapter = (ADAPTER) server.loadAdapter(behaviorClass, new NullProgressMonitor());
if (adapter == null) {
throw new CoreException(
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ui.editor;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
+import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
+
+public class LocalBehaviorUI implements IDeploymentTypeUI {
+ private IServerModeUICallback callback;
+ public void fillComposite(Composite parent, IServerModeUICallback callback) {
+ //Do Nothing, just verify
+ this.callback = callback;
+ verify();
+ callback.getServer().addPropertyChangeListener(new PropertyChangeListener(){
+ public void propertyChange(PropertyChangeEvent evt) {
+ verify();
+ }});
+ }
+
+ private void verify() {
+ String behaviourType = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(callback.getServer());
+ if( !LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(behaviourType))
+ callback.setErrorMessage(null);
+ else {
+ ServerExtendedProperties props = ExtendedServerPropertiesAdapterFactory.getServerExtendedProperties(callback.getServer());
+ IStatus status = props.verifyServerStructure();
+ callback.setErrorMessage(status.isOK() ? null : status.getMessage());
+ }
+ }
+
+ public void performFinish(IProgressMonitor monitor) throws CoreException {
+ // Do Nothing
+ }
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -261,8 +261,7 @@
}
private boolean shouldChangeDefaultDeployType(IServerWorkingCopy server) {
- return !server.getServerType().getId().equals(IJBossToolingConstants.DEPLOY_ONLY_SERVER) &&
- !server.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70);
+ return !server.getServerType().getId().equals(IJBossToolingConstants.DEPLOY_ONLY_SERVER);
}
public static class ChangeServerPropertyCommand extends ServerCommand {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-03-14 09:22:31 UTC (rev 39490)
@@ -630,4 +630,13 @@
type="org.jboss.ide.eclipse.as.ui.views.as7.management.content.IContentNode">
</propertyTester>
</extension>
+
+ <extension
+ point="org.jboss.ide.eclipse.as.ui.DeployMethodUI">
+ <ui
+ class="org.jboss.ide.eclipse.as.ui.editor.LocalBehaviorUI"
+ deployMethodId="local">
+ </ui>
+ </extension>
+
</plugin>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-14 09:22:31 UTC (rev 39490)
@@ -69,16 +69,6 @@
serverTypes="org.jboss.tools.openshift.express.openshift.server.type"
typeId="openshift">
</behaviour>
- <!--
- <behaviour
- behaviourDelegate="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBinaryBehaviourDelegate"
- launchDelegate="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressLaunchDelegate"
- name="Openshift Binary"
- publishMethod="org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBinaryPublishMethod"
- serverTypes="org.jboss.ide.eclipse.as.70"
- typeId="openshiftBinary">
- </behaviour>
- -->
</extension>
<extension
@@ -287,14 +277,6 @@
</fragment>
</extension>
- <!-- Openshift Binary -->
- <extension
- point="org.jboss.ide.eclipse.as.ui.DeployMethodUI">
- <ui class="org.jboss.tools.openshift.express.internal.ui.behaviour.ExpressBinaryUI"
- deployMethodId="openshiftBinary">
- </ui>
- </extension>
-
<!-- the 'Express console' view -->
<extension
point="org.eclipse.ui.views">
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-03-14 07:41:09 UTC (rev 39489)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-03-14 09:22:31 UTC (rev 39490)
@@ -256,7 +256,7 @@
* @param server the server to check
* @return true or false
*/
- public static boolean isOpenShiftRuntime(IServer server) {
+ public static boolean isOpenShiftRuntime(IServerAttributes server) {
final String serverTypeId = server.getServerType().getId();
return (OPENSHIFT_SERVER_TYPE.equals(serverTypeId));
}
@@ -331,7 +331,7 @@
return p == null ? null : p.length == 0 ? null : p[0];
}
- public static IProject findProjectForServersApplication(IServer server) {
+ public static IProject findProjectForServersApplication(IServerAttributes server) {
IApplication app = findApplicationForServer(server);
if (app == null) {
return null;
@@ -339,7 +339,7 @@
return ExpressServerUtils.findProjectForApplication(app);
}
- public static IApplication findApplicationForServer(IServer server) {
+ public static IApplication findApplicationForServer(IServerAttributes server) {
try {
String user = ExpressServerUtils.getExpressUsername(server);
UserDelegate user2 = UserModel.getDefault().findUser(user);
12 years, 8 months
JBoss Tools SVN: r39489 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-03-14 03:41:09 -0400 (Wed, 14 Mar 2012)
New Revision: 39489
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11118
Fix junit based on jmock problem
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java 2012-03-14 07:39:28 UTC (rev 39488)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java 2012-03-14 07:41:09 UTC (rev 39489)
@@ -56,6 +56,9 @@
allowing(consoleConfig).getConfiguration();
will(returnValue(config));
+
+ allowing(consoleConfig).hasConfiguration();
+ will(returnValue(true));
oneOf(ioe).getEntityName();
will(returnValue(innerIntricateName));
12 years, 8 months