JBoss Tools SVN: r22879 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-06-18 09:10:01 -0400 (Fri, 18 Jun 2010)
New Revision: 22879
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-6287 , combobox will show the first resource bundle in the list.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-18 11:40:46 UTC (rev 22878)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-18 13:10:01 UTC (rev 22879)
@@ -356,6 +356,12 @@
rbCombo.add(bundleEntry.uri);
}
}
+ /*
+ * Select the first bundle if there is any in the list
+ */
+ if (rbCombo.getItemCount() > 0) {
+ rbCombo.select(0);
+ }
}
/*
* Update status message.
15 years, 10 months
JBoss Tools SVN: r22878 - in trunk/vpe: tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-06-18 07:40:46 -0400 (Fri, 18 Jun 2010)
New Revision: 22878
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6287 , key generation was updated, escaped symbols were added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-18 09:41:13 UTC (rev 22877)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-18 11:40:46 UTC (rev 22878)
@@ -80,6 +80,9 @@
public class ExternalizeStringsWizardPage extends WizardPage {
+ private final char[] REPLACED_CHARACTERS = new char[] {'~', '!', '@', '#',
+ '$', '%', '^', '&', '*', '(', ')', '-', '+', '=', '{', '}', '[', ']', ':', ';', ',', '.', '?', '\\', '/'};
+ private final char[] LINE_DELEMITERS = new char[] {'\r', '\n', '\t'};
private final int DIALOG_WIDTH = 450;
private final int DIALOG_HEIGHT = 650;
private StructuredTextEditor editor;
@@ -330,8 +333,15 @@
* Update text string field.
* Trim the text to remove line breaks and caret returns.
*/
- propsValue.setText(text.trim());
/*
+ * Replace line delimiters white space
+ */
+ for (char ch : LINE_DELEMITERS) {
+ text = text.trim().replace(ch, ' ');
+ }
+ propsValue.setText(text);
+ propsKey.setText(generatePropertyKey(text));
+ /*
* Initialize bundle messages field
*/
if (bm == null) {
@@ -743,4 +753,51 @@
return bm;
}
+ /**
+ * Generate properties key.
+ * Replaces all non-word characters with
+ * underline character.
+ *
+ * @param text the text
+ * @return the result string
+ */
+ public String generatePropertyKey(String text) {
+ String result = text.trim();
+ /*
+ * Replace all other symbols with '_'
+ */
+ for (char ch : REPLACED_CHARACTERS) {
+ result = result.replace(ch, '_');
+ }
+ /*
+ * Replace line delimiters white space
+ */
+ for (char ch : LINE_DELEMITERS) {
+ result = result.replace(ch, ' ');
+ }
+ /*
+ * Replace all white spaces with '_'
+ */
+ result = result.replaceAll(Constants.WHITE_SPACE,
+ Constants.UNDERSCORE);
+ /*
+ * Correct underline symbols:
+ * show only one of them
+ */
+ result = result.replaceAll("_+", Constants.UNDERSCORE); //$NON-NLS-1$
+ /*
+ * Remove leading and trailing '_'
+ */
+ if (result.startsWith(Constants.UNDERSCORE)) {
+ result = result.substring(1);
+ }
+ if (result.endsWith(Constants.UNDERSCORE)) {
+ result = result.substring(0, result.length() - 1);
+ }
+ /*
+ * Return the result
+ */
+ return result;
+ }
+
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-18 09:41:13 UTC (rev 22877)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-18 11:40:46 UTC (rev 22878)
@@ -25,6 +25,14 @@
private final String FOLDER_TEXT_LABEL = "Enter or select the parent folder:"; //$NON-NLS-1$
private final String INCORRECT_TABLE_VALUE = "Table value is incorrect"; //$NON-NLS-1$
private final String CANNOT_FIND_PROPERTY_VALUE = "Cannot find 'Property Value' text field"; //$NON-NLS-1$
+ private final String COMPLEX_TEXT = "!! HELLO ~ Input User, Name.Page ?" //$NON-NLS-1$
+ + " \r\n and some more text \r\n" //$NON-NLS-1$
+ + "@ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ " //$NON-NLS-1$
+ + "\t ;.df:,ee {df}df[ty]"; //$NON-NLS-1$
+ private final String COMPLEX_KEY_RESULT = "HELLO_Input_User_Name_Page_and" + //$NON-NLS-1$
+ "_some_more_text_vc_yy_ghg_l_kk_mmm_fdg_df_ee_df_df_ty"; //$NON-NLS-1$
+ private final String COMPLEX_VALUE_RESULT = "!! HELLO ~ Input User, Name.Page ?" + //$NON-NLS-1$
+ " and some more text @ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ ;.df:,ee {df}df[ty]"; //$NON-NLS-1$
public ExternalizeStringsDialogTest() {
super();
@@ -64,8 +72,7 @@
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY,
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull("Cannot find 'Property Key' text field", defKeyText); //$NON-NLS-1$
- assertText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY,
- defKeyText);
+ assertText("User",defKeyText); //$NON-NLS-1$
SWTBotText defValueText = bot.textWithLabelInGroup(
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE,
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
@@ -108,8 +115,8 @@
/*
* Check replaced text
*/
- editor.toTextEditor().selectRange(7, 18, 14);
- assertEquals("Replaced text is incorrect", "#{Message.key}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
+ editor.toTextEditor().selectRange(7, 18, 15);
+ assertEquals("Replaced text is incorrect", "#{Message.User}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Check that properties file has been updated
*/
@@ -118,7 +125,7 @@
"Messages.properties"); //$NON-NLS-1$
editor2.toTextEditor().selectLine(3);
String line = editor2.toTextEditor().getSelection();
- assertEquals("'Messages.properties' was updated incorrectly", "key=User", line); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("'Messages.properties' was updated incorrectly", "User=User", line); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testNewFileInExternalizeStringsDialog() throws Throwable {
@@ -167,8 +174,8 @@
/*
* Check that the text was replaced
*/
- editor.toTextEditor().selectRange(7, 12, 7);
- assertEquals("Replaced text is incorrect", "#{.key}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
+ editor.toTextEditor().selectRange(7, 12, 9);
+ assertEquals("Replaced text is incorrect", "#{.Input}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Check that properties file has been created
*/
@@ -177,7 +184,7 @@
"externalize.properties"); //$NON-NLS-1$
editor2.toTextEditor().selectLine(1);
String line = editor2.toTextEditor().getSelection();
- assertEquals("Created file is incorrect", "key=Input", line); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Created file is incorrect", "Input=Input", line); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testEmptySelectionInExternalizeStringsDialog() throws Throwable {
@@ -218,7 +225,7 @@
/*
* Type some text outside the tag
*/
- editor.toTextEditor().typeText(13, 0, "Plain text in the JSP file"); //$NON-NLS-1$
+ editor.toTextEditor().typeText(13, 0, COMPLEX_TEXT);
/*
* Select nothing and call the dialog --
* the whole text should be selected.
@@ -231,13 +238,18 @@
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
/*
- * Check that the property value text is empty
+ * Check that the property key and value text
*/
+ SWTBotText defKeyText = bot.textWithLabelInGroup(
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY,
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
+ assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defKeyText);
+ assertText(COMPLEX_KEY_RESULT, defKeyText);
defValueText = bot.textWithLabelInGroup(
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE,
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText);
- assertText("Plain text in the JSP file", defValueText); //$NON-NLS-1$
+ assertText(COMPLEX_VALUE_RESULT, defValueText);
/*
* Close the dialog
*/
@@ -245,7 +257,7 @@
/*
* Check selection in the attribute's value
*/
- editor.toTextEditor().selectRange(18, 50, 0);
+ editor.toTextEditor().selectRange(22, 50, 0);
/*
* Activate the dialog
*/
15 years, 10 months
JBoss Tools SVN: r22877 - trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-06-18 05:41:13 -0400 (Fri, 18 Jun 2010)
New Revision: 22877
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5979 - safe check for editor instance was added.
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-18 05:54:50 UTC (rev 22876)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-18 09:41:13 UTC (rev 22877)
@@ -159,12 +159,13 @@
*/
IEditorPart editorPart = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- StructuredTextEditor structuredTextEditor = (StructuredTextEditor) editorPart;
- Object page = structuredTextEditor.getAdapter(IPropertySheetPage.class);
- if (page instanceof ConfigurablePropertySheetPage) {
- ((ConfigurablePropertySheetPage) page).refresh();
+ if (editorPart instanceof StructuredTextEditor) {
+ StructuredTextEditor structuredTextEditor = (StructuredTextEditor) editorPart;
+ Object page = structuredTextEditor.getAdapter(IPropertySheetPage.class);
+ if (page instanceof ConfigurablePropertySheetPage) {
+ ((ConfigurablePropertySheetPage) page).refresh();
+ }
}
-
clearListeners(newValue);
clearListeners(oldValue);
Object[] array = listeners.getListeners();
15 years, 10 months
JBoss Tools SVN: r22876 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-06-18 01:54:50 -0400 (Fri, 18 Jun 2010)
New Revision: 22876
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
Log:
JBIDE-6483 - to trunk, part two (missed file)
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2010-06-18 05:52:32 UTC (rev 22875)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2010-06-18 05:54:50 UTC (rev 22876)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
public class ESBRuntimeResolver_47 extends AbstractESBRuntimeResolver implements
IESBRuntimeResolver {
@@ -40,11 +41,15 @@
public List<IPath> getJarDirectories(String runtimeLocation, String configuration) {
List<IPath> directories = super.getJarDirectories(runtimeLocation, configuration);
IPath rtHome = new Path(runtimeLocation);
- IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION).append("server").append("default").append(
- "deployers").append("esb.deployer").append("lib");
+ IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION)
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOYERS)
+ .append("esb.deployer").append("lib");
- IPath deployPath = rtHome.append("server").append("default").append(
- "deployers").append("esb.deployer").append("lib");
+ IPath deployPath = rtHome
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOYERS)
+ .append("esb.deployer").append("lib");
directories.add(soapDeployPath);
directories.add(deployPath);
15 years, 10 months
JBoss Tools SVN: r22875 - branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-06-18 01:52:32 -0400 (Fri, 18 Jun 2010)
New Revision: 22875
Modified:
branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
Log:
JBIDE-6483 - to 3.1.x stream, part two (missed file)
Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2010-06-18 05:33:41 UTC (rev 22874)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2010-06-18 05:52:32 UTC (rev 22875)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
public class ESBRuntimeResolver_47 extends AbstractESBRuntimeResolver implements
IESBRuntimeResolver {
@@ -40,11 +41,15 @@
public List<IPath> getJarDirectories(String runtimeLocation, String configuration) {
List<IPath> directories = super.getJarDirectories(runtimeLocation, configuration);
IPath rtHome = new Path(runtimeLocation);
- IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION).append("server").append("default").append(
- "deployers").append("esb.deployer").append("lib");
+ IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION)
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOYERS)
+ .append("esb.deployer").append("lib");
- IPath deployPath = rtHome.append("server").append("default").append(
- "deployers").append("esb.deployer").append("lib");
+ IPath deployPath = rtHome
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOYERS)
+ .append("esb.deployer").append("lib");
directories.add(soapDeployPath);
directories.add(deployPath);
15 years, 10 months
JBoss Tools SVN: r22874 - branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-06-18 01:33:41 -0400 (Fri, 18 Jun 2010)
New Revision: 22874
Modified:
branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
Log:
JBIDE-6483 - to 3.1.x stream
Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2010-06-18 05:31:09 UTC (rev 22873)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2010-06-18 05:33:41 UTC (rev 22874)
@@ -16,6 +16,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
public abstract class AbstractESBRuntimeResolver implements IESBRuntimeResolver {
@@ -27,16 +29,17 @@
public List<IPath> getJarDirectories(String runtimeLocation, String configuration) {
if("".equals(configuration)){
- configuration = "default";
+ configuration = IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION;
}
List<IPath> directories = new ArrayList<IPath>();
IPath rtHome = new Path(runtimeLocation);
- IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION).append("server").append("default").append(
- "deploy");
- IPath deployPath = rtHome.append("server").append(configuration).append(
- "deploy");
+ IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION)
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOY);
+ IPath deployPath = rtHome.append(IJBossRuntimeResourceConstants.SERVER)
+ .append(configuration).append(IJBossRuntimeResourceConstants.DEPLOY);
IPath esbPath = deployPath.append(JBOSSESB_ESB);
IPath sarPath = deployPath.append(JBOSSESB_SAR);
15 years, 10 months
JBoss Tools SVN: r22873 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-06-18 01:31:09 -0400 (Fri, 18 Jun 2010)
New Revision: 22873
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
Log:
JBIDE-6483 to trunk
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2010-06-18 00:09:08 UTC (rev 22872)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2010-06-18 05:31:09 UTC (rev 22873)
@@ -16,6 +16,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
public abstract class AbstractESBRuntimeResolver implements IESBRuntimeResolver {
@@ -27,16 +29,17 @@
public List<IPath> getJarDirectories(String runtimeLocation, String configuration) {
if("".equals(configuration)){
- configuration = "default";
+ configuration = IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION;
}
List<IPath> directories = new ArrayList<IPath>();
IPath rtHome = new Path(runtimeLocation);
- IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION).append("server").append("default").append(
- "deploy");
- IPath deployPath = rtHome.append("server").append(configuration).append(
- "deploy");
+ IPath soapDeployPath = rtHome.append(SOAP_AS_LOCATION)
+ .append(IJBossRuntimeResourceConstants.SERVER).append(configuration)
+ .append(IJBossRuntimeResourceConstants.DEPLOY);
+ IPath deployPath = rtHome.append(IJBossRuntimeResourceConstants.SERVER)
+ .append(configuration).append(IJBossRuntimeResourceConstants.DEPLOY);
IPath esbPath = deployPath.append(JBOSSESB_ESB);
IPath sarPath = deployPath.append(JBOSSESB_SAR);
15 years, 10 months
JBoss Tools SVN: r22872 - trunk/jst/tests/org.jboss.tools.jst.css.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-17 20:09:08 -0400 (Thu, 17 Jun 2010)
New Revision: 22872
Modified:
trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties
Log:
https://jira.jboss.org/browse/JBIDE-6485 org.jboss.tools.vpe.ui.bot.test fails to compile
fix for manifest errors in jst.css.test plugin
Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties 2010-06-17 23:35:55 UTC (rev 22871)
+++ trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties 2010-06-18 00:09:08 UTC (rev 22872)
@@ -1,6 +1,8 @@
bin.includes = META-INF/,\
plugin.properties,\
- resources/
+ resources/,\
+ plugin.xml,\
+ .
jars.compile.order = .
source.. = src/
output.. = bin/
15 years, 10 months
JBoss Tools SVN: r22871 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-17 19:35:55 -0400 (Thu, 17 Jun 2010)
New Revision: 22871
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
Log:
fix for warning
[WARNING] Missing classpath entry jbossascore.jar MavenProject: org.jboss.tools:org.jboss.ide.eclipse.as.core:2.1.0-SNAPSHOT @ /mnt/hudson_workspace/workspace/jbosstools-tycho-dgolovin-experimental/src-jbosstools/as/plugins/org.jboss.ide.eclipse.as.core/pom.xml
during maven build. Missing jar are removed from plugin classpath
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2010-06-17 23:15:14 UTC (rev 22870)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2010-06-17 23:35:55 UTC (rev 22871)
@@ -38,7 +38,6 @@
org.jboss.ide.eclipse.as.core.util
Bundle-ClassPath: dom4j-1.6.1.jar,
jaxen-1.1-beta-6.jar,
- jbossascore.jar,
getopt.jar,
.
Bundle-Vendor: %Bundle-Vendor.0
15 years, 10 months
JBoss Tools SVN: r22870 - trunk/tptp/features/org.jboss.tools.tptp.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-17 19:15:14 -0400 (Thu, 17 Jun 2010)
New Revision: 22870
Modified:
trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml
Log:
https://jira.jboss.org/browse/JBIDE-6485 org.jboss.tools.vpe.ui.bot.test fails to compile
fix for tptp compilation errors
list of features adjusted
Modified: trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml
===================================================================
--- trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml 2010-06-17 22:24:40 UTC (rev 22869)
+++ trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml 2010-06-17 23:15:14 UTC (rev 22870)
@@ -1,40 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.tptp.feature"
- label="TPTP Profile On JBoss Server"
- version="1.1.0.qualifier"
- plugin="org.jboss.tools.eclipse.as.tptp">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/>
- </url>
-
- <requires>
- <import feature="org.eclipse.tptp.monitoring.runtime" version="4.4.100" match="greaterOrEqual"/>
- <import feature="org.eclipse.tptp.platform.runtime" version="4.5.1" match="greaterOrEqual"/>
- <import feature="org.eclipse.tptp.monitoring.profile.server" version="4.2.200" match="greaterOrEqual"/>
- <import feature="org.eclipse.tptp.platform.profile.server" version="4.3.200" match="greaterOrEqual"/>
- <import feature="org.eclipse.tptp.trace.runtime" version="4.3.200" match="greaterOrEqual"/>
- <import feature="org.eclipse.tptp.test.runtime" version="4.3.300" match="greaterOrEqual"/>
- </requires>
-
- <plugin
- id="org.jboss.tools.eclipse.as.tptp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.tptp.feature"
+ label="TPTP Profile On JBoss Server"
+ version="1.1.0.qualifier"
+ plugin="org.jboss.tools.eclipse.as.tptp">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/>
+ </url>
+
+ <requires>
+ <import feature="org.eclipse.tptp.platform.profile.server" version="4.5.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tptp.platform.instrumentation.ui" version="4.3.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tptp.platform.core" version="4.7.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tptp.platform.jvmti" version="4.5.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.tptp.platform.trace" version="4.5.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.jboss.tools.eclipse.as.tptp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
15 years, 10 months