JBoss Tools SVN: r37722 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-01-09 10:49:20 -0500 (Mon, 09 Jan 2012)
New Revision: 37722
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java
Log:
Remove calling method manageBlockingWidows().
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java 2012-01-09 14:53:44 UTC (rev 37721)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/suite/JBPMTest.java 2012-01-09 15:49:20 UTC (rev 37722)
@@ -1,6 +1,5 @@
package org.jboss.tools.jbpm.ui.bot.test.suite;
-import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -9,7 +8,6 @@
public static void prepare() {
log.info("jBPM All Test started...");
- SWTJBTExt.manageBlockingWidows(false, false);
eclipse.maximizeActiveShell();
eclipse.closeView(IDELabel.View.WELCOME);
bot.closeAllEditors();
12 years, 8 months
JBoss Tools SVN: r37721 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-09 09:53:44 -0500 (Mon, 09 Jan 2012)
New Revision: 37721
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF/MANIFEST.MF
Log:
Added dependencies for Maven tycho plugin
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-01-09 14:28:03 UTC (rev 37720)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/META-INF/MANIFEST.MF 2012-01-09 14:53:44 UTC (rev 37721)
@@ -17,5 +17,17 @@
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.ide.eclipse.as.ui;bundle-version="2.3.0",
- org.jboss.tools.portlet.ui;bundle-version="1.2.0"
+ org.eclipse.wst.jsdt.web.core;bundle-version="1.0.401",
+ org.eclipse.wst.jsdt.web.support.jsp;bundle-version="1.0.400",
+ org.eclipse.wst.jsdt.web.ui;bundle-version="1.0.401",
+ org.eclipse.jst.ejb.doc.user;bundle-version="1.1.301",
+ org.eclipse.jst.ejb.ui;bundle-version="1.1.600",
+ org.eclipse.jst.ejb.ui.infopop;bundle-version="1.0.300",
+ org.eclipse.jst.j2ee.doc.user;bundle-version="1.1.400",
+ org.eclipse.jst.j2ee.ejb.annotations.emitter;bundle-version="1.1.200",
+ org.eclipse.jst.j2ee.ejb.annotations.ui;bundle-version="1.1.200",
+ org.eclipse.jst.j2ee.ejb.annotations.xdoclet;bundle-version="1.2.200",
+ org.eclipse.jst.j2ee.infopop;bundle-version="1.0.300",
+ org.eclipse.jst.j2ee.xdoclet.runtime;bundle-version="1.1.300",
+ org.eclipse.jst.jee.ejb;bundle-version="1.0.301",
+ org.eclipse.jst.jee.web;bundle-version="1.0.301"
12 years, 8 months
JBoss Tools SVN: r37720 - trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-01-09 09:28:03 -0500 (Mon, 09 Jan 2012)
New Revision: 37720
Modified:
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
Log:
Remove calling method manageBlockingWidows().
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-01-09 13:31:49 UTC (rev 37719)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2012-01-09 14:28:03 UTC (rev 37720)
@@ -25,7 +25,6 @@
import org.jboss.tools.drools.ui.bot.test.smoke.OpenDroolsPerspective;
import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -115,7 +114,6 @@
@BeforeClass
public static void setUpTest() {
- SWTJBTExt.manageBlockingWidows(false, false);
props = util.loadProperties(Activator.PLUGIN_ID);
String guvnorRepositoryUrl = props.getProperty(DroolsAllBotTests.GUVNOR_REPOSITORY_URL_PROPERTY_NAME);
if (guvnorRepositoryUrl != null){
12 years, 8 months
JBoss Tools SVN: r37719 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-01-09 08:31:49 -0500 (Mon, 09 Jan 2012)
New Revision: 37719
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java
Log:
https://issues.jboss.org/browse/JBIDE-10600 - junit was fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java 2012-01-09 12:51:51 UTC (rev 37718)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnJsf20Test_JBIDE5382.java 2012-01-09 13:31:49 UTC (rev 37719)
@@ -30,22 +30,16 @@
* @author Yahor Radtsevich (yradtsevich)
*/
public class OpenOnJsf20Test_JBIDE5382 extends VpeTest {
- private static final String OUTPUT_STYLESHEET_ELEMENT_ID
- = "outputStylesheet1"; //$NON-NLS-1$
- private static final String OUTPUT_STYLESHEET_LIB_ELEMENT_ID
- = "outputStylesheet2"; //$NON-NLS-1$
- private static final String OUTPUT_SCRIPT_ELEMENT_ID
- = "outputScript1"; //$NON-NLS-1$
- private static final String OUTPUT_SCRIPT_LIB_ELEMENT_ID
- = "outputScript2"; //$NON-NLS-1$
+ private static final String OUTPUT_STYLESHEET_ELEMENT_ID = "outputStylesheet1"; //$NON-NLS-1$
+ private static final String OUTPUT_STYLESHEET_LIB_ELEMENT_ID = "outputStylesheet2"; //$NON-NLS-1$
+ private static final String OUTPUT_SCRIPT_ELEMENT_ID = "outputScript1"; //$NON-NLS-1$
+ private static final String OUTPUT_SCRIPT_LIB_ELEMENT_ID = "outputScript2"; //$NON-NLS-1$
private static final String SCRIPT_FILE_NAME = "f1.js"; //$NON-NLS-1$
private static final String SCRIPT_LIB_FILE_NAME = "f2.js"; //$NON-NLS-1$
- private static final String STYLESHEET_FILE_NAME
- = "stylesRed.css"; //$NON-NLS-1$
- private static final String STYLESHEET_LIB_FILE_NAME
- = "stylesBlue.css"; //$NON-NLS-1$
- private static final String TEST_FILE_PATH
- = "JBIDE/5382/OpenOnJsf20.xhtml"; //$NON-NLS-1$
+ private static final String STYLESHEET_FILE_NAME = "stylesRed.css"; //$NON-NLS-1$
+ private static final String STYLESHEET_LIB_FILE_NAME = "stylesBlue.css"; //$NON-NLS-1$
+ private static final String TEST_FILE_PATH = "JBIDE/5382/OpenOnJsf20.xhtml"; //$NON-NLS-1$
+ private static final String JSF_HTML_TLD = "html_basic.tld"; //$NON-NLS-1$
private VpeController vpeController;
private Document sourceDocument;
@@ -89,13 +83,27 @@
public void testVisualOpenOnOutputStylesheet() {
showInvisibleTags();
openOnCorrespondingVisualNode(getOutputStylesheetNode());
- assertActiveEditorInputNameEquals(STYLESHEET_FILE_NAME);
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10600
+ * OpenOn for visual nodes is not available.
+ * OpenOn will be performed on corresponding source node in any case:
+ * For this invisible tag -- on the whole source node, but not on its attribute.
+ * For h:outputStyleSheet "html_basic.tld" will be opened.
+ */
+ assertActiveEditorInputNameEquals(JSF_HTML_TLD);
}
public void testVisualOpenOnOutputScript() {
showInvisibleTags();
openOnCorrespondingVisualNode(getOutputScriptNode());
- assertActiveEditorInputNameEquals(SCRIPT_FILE_NAME);
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10600
+ * OpenOn for visual nodes is not available.
+ * OpenOn will be performed on corresponding source node in any case:
+ * for this invisible tag -- on the whole source node, but not on its attribute.
+ * For h:outputScript "html_basic.tld" will be opened.
+ */
+ assertActiveEditorInputNameEquals(JSF_HTML_TLD);
}
////////////////////////////////////////////////////////////////////////////
12 years, 8 months
JBoss Tools SVN: r37718 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-01-09 07:51:51 -0500 (Mon, 09 Jan 2012)
New Revision: 37718
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/BadRestWS.java.ws
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/CorrectRestWS.java.ws
Log:
New JAX-RS resources added
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/BadRestWS.java.ws
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/BadRestWS.java.ws (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/BadRestWS.java.ws 2012-01-09 12:51:51 UTC (rev 37718)
@@ -0,0 +1,17 @@
+package {0};
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+
+@Path("/rest")
+public class {1} '{'
+
+ @GET
+ @Path("/'{'id'}'")
+ public String getMessage(@PathParam("none") int id) '{'
+ return null;
+ '}'
+
+'}'
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/CorrectRestWS.java.ws
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/CorrectRestWS.java.ws (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/restful/CorrectRestWS.java.ws 2012-01-09 12:51:51 UTC (rev 37718)
@@ -0,0 +1,17 @@
+package {0};
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+
+@Path("/rest")
+public class {1} '{'
+
+ @GET
+ @Path("/'{'id'}'")
+ public String getMessage(@PathParam("id") int id) '{'
+ return null;
+ '}'
+
+'}'
12 years, 8 months
JBoss Tools SVN: r37717 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-01-09 06:26:48 -0500 (Mon, 09 Jan 2012)
New Revision: 37717
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java
Log:
https://issues.jboss.org/browse/JBIDE-10600 - error message was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2012-01-09 11:25:31 UTC (rev 37716)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2012-01-09 11:26:48 UTC (rev 37717)
@@ -107,7 +107,7 @@
try {
nodeMapping = visualMap.get(queryInterface(visualNode, nsIDOMNode.class));
} catch (XPCOMException e) {
- VpePlugin.getDefault().logError("Cannot parse visualNode to nsIDOMNode type", e); //$NON-NLS-1$
+ VpePlugin.getDefault().logError("Cannot cast visualNode to nsIDOMNode type", e); //$NON-NLS-1$
}
}
return nodeMapping;
12 years, 8 months
JBoss Tools SVN: r37716 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-01-09 06:25:31 -0500 (Mon, 09 Jan 2012)
New Revision: 37716
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java
Log:
https://issues.jboss.org/browse/JBIDE-10600 - casting to nsIDOMNode was added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2012-01-09 10:25:30 UTC (rev 37715)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2012-01-09 11:25:31 UTC (rev 37716)
@@ -10,15 +10,19 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.mapping;
+import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface;
+
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.xpcom.XPCOMException;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -95,7 +99,16 @@
* Replaced with map.
*/
if (visualNode != null) {
- nodeMapping = visualMap.get(visualNode);
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10600
+ * visualNode could be a nsIDOMElement or other,
+ * to get right mapping it should be exactly nsIDOMNode.
+ */
+ try {
+ nodeMapping = visualMap.get(queryInterface(visualNode, nsIDOMNode.class));
+ } catch (XPCOMException e) {
+ VpePlugin.getDefault().logError("Cannot parse visualNode to nsIDOMNode type", e); //$NON-NLS-1$
+ }
}
return nodeMapping;
}
12 years, 8 months
JBoss Tools SVN: r37715 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-01-09 05:25:30 -0500 (Mon, 09 Jan 2012)
New Revision: 37715
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java
Log:
corrected message that was displayed when project is already present from warning to error message
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2012-01-09 09:44:24 UTC (rev 37714)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2012-01-09 10:25:30 UTC (rev 37715)
@@ -93,16 +93,6 @@
return confirmed[0];
}
- private void openWarning(final String title, final String message) {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- MessageDialog.openWarning(getShell(), title, message);
- }
- });
- }
-
@Override
public void addPages() {
this.model = new ImportProjectWizardModel();
@@ -152,7 +142,7 @@
return Status.OK_STATUS;
} catch (final WontOverwriteException e) {
- openWarning("Project already present", e.getMessage());
+ openError("Project already present", e.getMessage());
return Status.CANCEL_STATUS;
} catch (final ImportFailedException e) {
return OpenShiftUIActivator.createErrorStatus(
@@ -188,4 +178,15 @@
}
}
}
+
+ private void openError(final String title, final String message) {
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ MessageDialog.openError(getShell(), title, message);
+ }
+ });
+ }
+
}
12 years, 8 months
JBoss Tools SVN: r37714 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-01-09 04:44:24 -0500 (Mon, 09 Jan 2012)
New Revision: 37714
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
Log:
pom.xml correction
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-01-09 08:06:39 UTC (rev 37713)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-01-09 09:44:24 UTC (rev 37714)
@@ -46,48 +46,6 @@
</dependencies>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.antrun.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>default-swtbot-config</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
- <if>
- <not>
- <isset property="jboss.tools.jre.6"/>
- </not>
- <then>
- <property name="jboss.tools.jre.6" value="${java.home}" />
- </then>
- </if>
- <echo file="swtbot.properties" append="false">SERVER=AS,6.0,1.6,${requirement.build.root}/jboss-6.0.0.Final
-JAVA=1.6,${jboss.tools.jre.6}
- </echo>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
12 years, 8 months
JBoss Tools SVN: r37713 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-01-09 03:06:39 -0500 (Mon, 09 Jan 2012)
New Revision: 37713
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
Log:
JBDS-1974 - changing jboss_config to jboss_config_dir, which accounts for more usecases
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-01-09 07:45:20 UTC (rev 37712)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-01-09 08:06:39 UTC (rev 37713)
@@ -93,17 +93,12 @@
}
private void setEffectiveBaseDir() {
- IPath dir = baseDir == null ? null : new Path(baseDir);
- if( dir == null && category != null) {
- dir = getCategory().getServer().getRuntime().getLocation();
- }
- if( dir != null && !dir.isAbsolute() && category != null)
- dir = getCategory().getServer().getRuntime().getLocation().append(dir);
+ String serverName = server == null ? "" : server.getName(); //$NON-NLS-1$
+ String dir1 = baseDir == null ? null : baseDir;
String dir2 = null;
- String serverName = server == null ? "" : server.getName(); //$NON-NLS-1$
- if( dir != null ) {
- dir2 = dir.toString().replace("${jboss_config_dir}", //$NON-NLS-1$
+ if( dir1 != null ) {
+ dir2 = dir1.replace("${jboss_config_dir}", //$NON-NLS-1$
"${jboss_config_dir:" + serverName + "}"); //$NON-NLS-1$ //$NON-NLS-2$
dir2 = dir2.replace("${jboss_config}", //$NON-NLS-1$
"${jboss_config:" + serverName + "}"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -114,7 +109,16 @@
true, StringVariableManager.getDefault());
} catch( CoreException ce ) {}
}
- effectiveBaseDir = dir2 == null ? null : dir2.toString();
+
+
+ IPath dir = dir2 == null ? null : new Path(dir2);
+ if( dir == null && category != null) {
+ dir = getCategory().getServer().getRuntime().getLocation();
+ }
+ if( dir != null && !dir.isAbsolute() && category != null)
+ dir = getCategory().getServer().getRuntime().getLocation().append(dir);
+
+ effectiveBaseDir = dir == null ? null : dir.toString();
}
protected AntFileFilter getFilter() {
12 years, 8 months