JBoss Tools SVN: r25571 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-10-07 12:45:06 -0400 (Thu, 07 Oct 2010)
New Revision: 25571
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
Log:
https://jira.jboss.org/browse/JBIDE-7060 , unnecessary code was removed from MozillaEditor.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-10-07 16:24:41 UTC (rev 25570)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-10-07 16:45:06 UTC (rev 25571)
@@ -1102,7 +1102,6 @@
return tooltipListener;
}
-
// /**
// * Update Externalize Strings toolbar icon state.
// * <p>
@@ -1152,55 +1151,4 @@
// externalizeStringsAction.setEnabled(false);
// }
// }
-// /**
-// * Update Externalize Strings toolbar icon state.
-// * <p>
-// * Enables the button when suitable text is selected.
-// * Disabled otherwise.
-// */
-// public void updateExternalizeStringsToolbarIconState() {
-// StructuredTextEditor editor = controller.getSourceEditor();
-// ISelection sel = editor.getSelectionProvider().getSelection();
-// String stringToUpdate = Constants.EMPTY;
-// if ((sel instanceof TextSelection)
-// && (sel instanceof IStructuredSelection)
-// && (((IStructuredSelection) sel).size() == 1)) {
-// String text = Constants.EMPTY;
-// TextSelection textSelection = null;
-// IStructuredSelection structuredSelection = (IStructuredSelection) sel;
-// textSelection = (TextSelection) sel;
-// text = textSelection.getText();
-// Object selectedElement = structuredSelection.getFirstElement();
-// /*
-// * When selected text is empty parse selected element and find a
-// * string to replace..
-// */
-// if ((text.trim().length() == 0)) {
-// if (selectedElement instanceof org.w3c.dom.Text) {
-// /*
-// * ..it could be a plain text
-// */
-// org.w3c.dom.Text textNode = (org.w3c.dom.Text) selectedElement;
-// if (textNode.getNodeValue().trim().length() > 0) {
-// stringToUpdate = textNode.getNodeValue();
-// }
-// } else if (selectedElement instanceof Attr) {
-// /*
-// * ..or an attribute's value
-// */
-// Attr attrNode = (Attr) selectedElement;
-// if (attrNode.getNodeValue().trim().length() > 0) {
-// stringToUpdate = attrNode.getNodeValue();
-// }
-// }
-// } else {
-// stringToUpdate = text;
-// }
-// }
-// if ((stringToUpdate.length() > 0)) {
-// externalizeStringsAction.setEnabled(true);
-// } else {
-// externalizeStringsAction.setEnabled(false);
-// }
-// }
}
13 years, 9 months
JBoss Tools SVN: r25570 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-10-07 12:24:41 -0400 (Thu, 07 Oct 2010)
New Revision: 25570
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-7247 , initial values correction.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2010-10-07 16:02:55 UTC (rev 25569)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2010-10-07 16:24:41 UTC (rev 25570)
@@ -80,6 +80,10 @@
}
page2.setFileName(fileName);
/*
+ * The new file should not exist
+ */
+ page2.setAllowExistingResources(false);
+ /*
* Add all the pages to the wizard
*/
addPage(page1);
@@ -107,8 +111,9 @@
return false;
}
/*
- * Add "key=value" to the bundle if file is not new,
- * If it is new, it got input by getInitialContent()
+ * Add "key=value" to the bundle file that is already exists.
+ * When the file is new key and value will be written to the file content
+ * via getInitialContent() method of the page2 during the file creation.
*/
if (bundleFile.exists() && !page1.isNewFile()) {
InputStream is = new ByteArrayInputStream(page1.getKeyValuePair().getBytes());
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java 2010-10-07 16:02:55 UTC (rev 25569)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java 2010-10-07 16:24:41 UTC (rev 25570)
@@ -338,6 +338,14 @@
if (rbCombo.getItemCount() > 0) {
rbCombo.select(0);
setResourceBundlePath(rbCombo.getText());
+ } else {
+ /*
+ * https://jira.jboss.org/browse/JBIDE-7247
+ * Select 'Create new file' checkbox and
+ * disable bundle group if no bundles are found.
+ */
+ newFile.setSelection(true);
+ enableBundleGroup(false);
}
}
/*
@@ -717,7 +725,7 @@
@Override
public boolean canFlipToNextPage() {
return isPageComplete() && (getNextPage() != null)
- && (newFile.getSelection() == true);
+ && isNewFile();
}
/**
13 years, 9 months
JBoss Tools SVN: r25569 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-07 12:02:55 -0400 (Thu, 07 Oct 2010)
New Revision: 25569
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
JBIDE-7245
https://jira.jboss.org/browse/JBIDE-7245
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml 2010-10-07 16:01:01 UTC (rev 25568)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml 2010-10-07 16:02:55 UTC (rev 25569)
@@ -19,6 +19,10 @@
</navigation>
</page>
+ <page view-id="/home1.xhtml"
+ no-conversation-view-id="/home2.xhtml">
+ </page>
+
<exception class="org.jboss.seam.framework.EntityNotFoundException">
<redirect view-id="/error.xhtml">
<message>Not found</message>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-10-07 16:01:01 UTC (rev 25568)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-10-07 16:02:55 UTC (rev 25569)
@@ -817,6 +817,18 @@
SeamValidationMessages.UNRESOLVED_VIEW_ID,
new Object[] {"/home2.xhtml"},
17);
+ assertMarkerIsCreatedForLine(
+ seamValidator,
+ "WebContent/WEB-INF/pages.xml",
+ SeamValidationMessages.UNRESOLVED_VIEW_ID,
+ new Object[] {"/home1.xhtml"},
+ 22);
+ assertMarkerIsCreatedForLine(
+ seamValidator,
+ "WebContent/WEB-INF/pages.xml",
+ SeamValidationMessages.UNRESOLVED_VIEW_ID,
+ new Object[] {"/home2.xhtml"},
+ 23);
}
public static int getMarkersNumber(IResource resource) {
13 years, 9 months
JBoss Tools SVN: r25568 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-07 12:01:01 -0400 (Thu, 07 Oct 2010)
New Revision: 25568
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
JBIDE-7245
https://jira.jboss.org/browse/JBIDE-7245
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-10-07 15:30:27 UTC (rev 25567)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-10-07 16:01:01 UTC (rev 25568)
@@ -1009,33 +1009,43 @@
XModelObject object = EclipseResourceUtil.createObjectForResource(f);
if(object == null) return;
if(object.getModelEntity().getName().startsWith(SeamPagesConstants.ENT_FILE_SEAM_PAGE)) {
- validatePageRedirects(object, f);
+ validatePageViewIds(object, f);
}
}
}
- private void validatePageRedirects(XModelObject o, IFile f) {
+ private void validatePageViewIds(XModelObject o, IFile f) {
String entity = o.getModelEntity().getName();
+ validatePageViewId(o, f);
if(entity.startsWith(SeamPagesConstants.ENT_REDIRECT) || entity.startsWith(SeamPagesConstants.ENT_RENDER)) {
- validatePageRedirect(o, f);
} else {
XModelObject[] cs = o.getChildren();
for (XModelObject c: cs) {
- validatePageRedirects(c, f);
+ validatePageViewIds(c, f);
}
}
}
- private void validatePageRedirect(XModelObject redirect, IFile f) {
- String path = redirect.getAttributeValue(SeamPagesConstants.ATTR_VIEW_ID);
+ static String ATTR_NO_CONVERSATION_VIEW_ID = "no conversation view id";
+ static String ATTR_LOGIN_VIEW_ID = "login view id";
+
+ private void validatePageViewId(XModelObject object, IFile f) {
+ validatePageViewId(object, f, SeamPagesConstants.ATTR_VIEW_ID);
+ validatePageViewId(object, f, ATTR_NO_CONVERSATION_VIEW_ID);
+ validatePageViewId(object, f, ATTR_LOGIN_VIEW_ID);
+ }
+
+ private void validatePageViewId(XModelObject object, IFile f, String attr) {
+ if(object.getModelEntity().getAttribute(attr) == null) return;
+ String path = object.getAttributeValue(attr);
if(path == null || path.length() == 0 || path.indexOf('*') >= 0) return;
path = path.replace('\\', '/');
if(path.indexOf('?') >= 0) {
path = path.substring(0, path.indexOf('?'));
}
- XModelObject target = redirect.getModel().getByPath(path);
+ XModelObject target = object.getModel().getByPath(path);
if(target == null) {
- XMLValueInfo i = new XMLValueInfo(redirect, SeamPagesConstants.ATTR_VIEW_ID);
+ XMLValueInfo i = new XMLValueInfo(object, attr);
addError(NLS.bind(SeamValidationMessages.UNRESOLVED_VIEW_ID, path), SeamPreferences.UNRESOLVED_VIEW_ID, i, f);
}
13 years, 9 months
JBoss Tools SVN: r25567 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-07 11:30:27 -0400 (Thu, 07 Oct 2010)
New Revision: 25567
Modified:
trunk/build/publish.sh
Log:
collect SVN paths and revisions into new SVN_REVISION.txt file
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-10-07 15:14:16 UTC (rev 25566)
+++ trunk/build/publish.sh 2010-10-07 15:30:27 UTC (rev 25567)
@@ -48,6 +48,23 @@
# note the job name, build number, SVN rev, and build ID of the latest snapshot zip
mkdir -p ${STAGINGDIR}/logs
+bl=${STAGINGDIR}/logs/BUILDLOG.txt
+wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
+
+# JBDS-1361 - instead of SVN_REVISION, scrape ${bl} (BUILDLOG.txt)
+# Updating http://anonsvn.jboss.org/repos/tdesigner/branches/7.1
+# ...
+# At revision 1063
+# Updating http://anonsvn.jboss.org/repos/jbosstools/trunk/build
+# ...
+# At revision 25503
+# -- or --
+# Checking out https://svn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.0.Beta1
+# ...
+# At revision 25538
+rl=${STAGINGDIR}/logs/SVN_REVISION.txt
+sed -ne "/Updating http.\+\|Checking out http.\+\|At revision \d\+/ p" ${bl} " > ${rl}
+
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
if [[ ${SVN_REVISION} ]]; then
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
@@ -136,10 +153,9 @@
ant -f ${ANT_SCRIPT} ${ANT_PARAMS}
fi
-# get full build log and filter out Maven test failures
+# ${bl} is full build log; see above
mkdir -p ${STAGINGDIR}/logs
-bl=${STAGINGDIR}/logs/BUILDLOG.txt
-wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
+# filter out Maven test failures
fl=${STAGINGDIR}/logs/FAIL_LOG.txt
# ignore warning lines and checksum failures
sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne "/<<< FAI/,+9 p" | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
13 years, 9 months
JBoss Tools SVN: r25566 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-10-07 11:14:16 -0400 (Thu, 07 Oct 2010)
New Revision: 25566
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java
Log:
https://jira.jboss.org/browse/JBIDE-7060 , selection check was updated.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java 2010-10-07 15:04:34 UTC (rev 25565)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18Handler.java 2010-10-07 15:14:16 UTC (rev 25566)
@@ -27,6 +27,7 @@
import org.eclipse.ui.menus.UIElement;
import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsDialog;
+import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsUtils;
import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsWizard;
import org.w3c.dom.Attr;
@@ -65,9 +66,7 @@
private static boolean getExternalizeStringsCommandEnabled(ISelection selection) {
boolean enabled=false;
String stringToUpdate = ""; //$NON-NLS-1$
- if ((selection instanceof TextSelection)
- && (selection instanceof IStructuredSelection)
- && (((IStructuredSelection) selection).size() == 1)) {
+ if (ExternalizeStringsUtils.isSelectionCorrect(selection)) {
String text = ""; //$NON-NLS-1$
TextSelection textSelection = null;
IStructuredSelection structuredSelection = (IStructuredSelection) selection;
13 years, 9 months
JBoss Tools SVN: r25565 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-07 11:04:34 -0400 (Thu, 07 Oct 2010)
New Revision: 25565
Modified:
trunk/build/target-platform/e361-wtp322.target
trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
Log:
update target platform to newer deps
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-10-07 15:03:08 UTC (rev 25564)
+++ trunk/build/target-platform/e361-wtp322.target 2010-10-07 15:04:34 UTC (rev 25565)
@@ -85,29 +85,29 @@
<unit version="1.1.0.v20090119-79318s73533B57" id="com.ibm.icu.base.feature.group"/>
<unit version="1.0.0.v20100510-7K7QErDzbb9z-yqHb55T7I" id="org.eclipse.equinox.server.core.feature.group"/>
<unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/>
- <unit version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93" id="org.eclipse.help.feature.group"/>
- <unit version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH" id="org.eclipse.jdt.feature.group"/>
+ <unit version="1.2.0.v20100427-7e7jEQFEp4jsWdToIUAoF3" id="org.eclipse.help.feature.group"/>
+ <unit version="3.6.2.r362_v20100929-7z8XFUUFLFlmgNd0-FWRdE5LVkHD" id="org.eclipse.jdt.feature.group"/>
<unit version="3.6.1.r361_v20100910-9gF78GroFrD9Uh-LhvxMFCV2hCz01p6896L" id="org.eclipse.platform.feature.group"/>
<unit version="3.6.1.M20100929-0800" id="org.eclipse.platform.ide"/>
<unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable.feature.group"/>
<unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable"/>
<unit version="3.6.1.M20100909-0800" id="org.eclipse.platform.sdk"/>
<unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ" id="org.eclipse.pde.feature.group"/>
- <unit version="3.6.1.r361_v20100714-0800-7Q7m6DDaKf5o53L9dz-d8n-yz-tWdHTE5xVLpsrf4c764" id="org.eclipse.sdk.feature.group"/>
- <unit version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T" id="org.eclipse.rcp.feature.group"/>
+ <unit version="3.6.2.r362_v20100929-7Q7m7ADDaKh5oy2I9f2lQXpSyL-9CiqLvldnOHsKdlXb4" id="org.eclipse.sdk.feature.group"/>
+ <unit version="3.6.2.r362_v20100929-9OArFLdFjY-Th_BOmHvM1fT" id="org.eclipse.rcp.feature.group"/>
<unit version="3.6.0.M20100909-0800" id="org.eclipse.rcp.id"/>
<unit version="3.6.0.M20100929-0800" id="org.eclipse.rcp.sdk.id"/>
<unit version="3.3.0.v20100427-44A77w31211642" id="org.eclipse.releng.tools.feature.group"/>
<unit version="3.6.1.M20100929-0800" id="org.eclipse.sdk.ide"/>
- <unit version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX" id="org.eclipse.sdk.examples.feature.group"/>
+ <unit version="3.3.0.v20100527-817fFcfFEdcVcUWlgyBRcVX" id="org.eclipse.sdk.examples.feature.group"/>
<unit version="3.3.0.v20100527" id="org.eclipse.sdk.examples.source.feature.group"/>
<unit version="3.6.0.v20100421-7V7RFiwFLSgEt4Pctn77c7J" id="org.eclipse.equinox.compendium.sdk.feature.group"/>
<unit version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F" id="org.eclipse.equinox.core.sdk.feature.group"/>
<unit version="1.0.0.v20100510-4--9oB5855K7P" id="org.eclipse.equinox.p2.discovery.feature.feature.group"/>
- <unit version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
- <unit version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr" id="org.eclipse.equinox.p2.sdk.feature.group"/>
+ <unit version="2.0.1.r361_v20100903-897HFZGFYxvZ7cEJrRz0-9_0" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
+ <unit version="3.6.0.v20100503-9I7VGAgG7w-PNFWurwLPmgB" id="org.eclipse.equinox.p2.sdk.feature.group"/>
<unit version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw" id="org.eclipse.equinox.serverside.sdk.feature.group"/>
- <unit version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07" id="org.eclipse.equinox.sdk.feature.group"/>
+ <unit version="3.6.1.r361_v20100903-7H7R07v8rtOZz0Yax3hIIyrhnXLc" id="org.eclipse.equinox.sdk.feature.group"/>
<unit version="1.0.0.v20100421-79--EVVFNFFsFc" id="org.eclipse.equinox.weaving.sdk.feature.group"/>
<unit version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ" id="org.eclipse.equinox.server.jetty.feature.group"/>
<unit version="1.0.0.v20100503-7x7IFGOFQ74dz0POCNUBjA6L" id="org.eclipse.equinox.server.p2.feature.group"/>
@@ -115,7 +115,7 @@
<unit version="1.1.0.M20100929-0800" id="org.eclipse.equinox.p2.ui.admin.rcp.product"/>
<unit version="1.0.0.v20100510-42A79oB5855K5E" id="org.eclipse.equinox.server.servletbridge.feature.group"/>
<unit version="1.0.0.v20100510-44DF8s734C48662444" id="org.eclipse.equinox.server.simple.feature.group"/>
- <unit version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T" id="org.eclipse.rcp.feature.group"/>
+ <unit version="3.6.2.r362_v20100929-9OArFLdFjY-Th_BOmHvM1fT" id="org.eclipse.rcp.feature.group"/>
<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -199,4 +199,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-07 15:03:08 UTC (rev 25564)
+++ trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-07 15:04:34 UTC (rev 25565)
@@ -57,6 +57,7 @@
<iu version="" id="org.jdom.feature.feature.group"/>
<iu version="" id="org.mozilla.xulrunner.feature.feature.group"/>
<iu version="" id="org.mozilla.xpcom.feature.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
<iu version="" id="org.eclipse.emf.ecore.feature.group"/>
<iu version="" id="org.eclipse.emf.feature.group"/>
<iu version="" id="org.eclipse.emf.codegen.feature.group"/>
@@ -78,6 +79,7 @@
<iu version="" id="org.eclipse.birt.feature.group"/>
<iu version="" id="org.eclipse.birt.integration.wtp.feature.group"/>
<iu version="" id="org.eclipse.birt.chart.feature.group"/>
+<iu version="" id="org.eclipse.birt.chart.integration.wtp.feature.group"/>
<iu version="" id="com.ibm.icu.base.feature.group"/>
<iu version="" id="org.eclipse.equinox.server.core.feature.group"/>
<iu version="" id="org.eclipse.cvs.feature.group"/>
13 years, 9 months
JBoss Tools SVN: r25564 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-07 11:03:08 -0400 (Thu, 07 Oct 2010)
New Revision: 25564
Modified:
trunk/build/target-platform/build.xml
Log:
add new 'all' target to both generate target platform and then build w/ it (test target platform for completeness)
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2010-10-07 14:45:29 UTC (rev 25563)
+++ trunk/build/target-platform/build.xml 2010-10-07 15:03:08 UTC (rev 25564)
@@ -1,4 +1,4 @@
-<project default="custom.hudson.build" name="jbosstools target platform p2.mirror generator - ant script for Hudson">
+<project default="build.local.target.platform.repo" name="jbosstools target platform p2.mirror generator - ant script for Hudson">
<property name="targetFile" value="e361-wtp322.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
@@ -34,8 +34,10 @@
</condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
- <target name="custom.hudson.build" depends="init, get.arch, get.eclipse, gen.p2mirror.script, run.p2mirror.script, cleanup" />
+ <target name="all" depends="build.local.target.platform.repo, test.local.target.platform.repo"/>
+ <target name="build.local.target.platform.repo" depends="init, get.arch, get.eclipse, gen.p2mirror.script, run.p2mirror.script, cleanup" />
+
<target name="init">
<ant antfile="${build.xml}" target="init" />
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -106,4 +108,10 @@
<target name="cleanup">
<delete dir="${tmpdir}" quiet="true" includeemptydirs="true" />
</target>
+
+ <target name="test.local.target.platform.repo" description="test target platform completeness by running a build against it">
+ <exec executable="/opt/maven3/bin/mvn" dir="${WORKINGDIR}">
+ <arg line=" -f ../pom.xml clean install -B -U -fae -e -P helios-local-target,!helios -Dmaven.test.skip"/>
+ </exec>
+ </target>
</project>
13 years, 9 months
JBoss Tools SVN: r25563 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-07 10:45:29 -0400 (Thu, 07 Oct 2010)
New Revision: 25563
Modified:
trunk/build/target-platform/e361-wtp322.target
Log:
add org.eclipse.tptp.platform.profile.server.feature.group to target platform
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-10-07 14:35:37 UTC (rev 25562)
+++ trunk/build/target-platform/e361-wtp322.target 2010-10-07 14:45:29 UTC (rev 25563)
@@ -47,6 +47,7 @@
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
<repository location="http://download.eclipse.org/tptp/updates/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
13 years, 9 months
JBoss Tools SVN: r25562 - trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-07 10:35:37 -0400 (Thu, 07 Oct 2010)
New Revision: 25562
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties
Log:
JBIDE-7272
https://jira.jboss.org/browse/JBIDE-7272
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties 2010-10-07 14:26:33 UTC (rev 25561)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties 2010-10-07 14:35:37 UTC (rev 25562)
@@ -2,6 +2,12 @@
FileCDIBeans_Properties.Title=File CDI beans.xml
+CDIDecorators_Properties.Title=Decorators
+CDIAlternatives_Properties.Title=Alternatives
+CDIInterceptors_Properties.Title=Interceptors
+CDIClass_Properties.Title=Class
+CDIStereotype_Properties.Title=Stereotype
+
CDIWeldScan_Properties.Title=Weld Scan
CDIWeldScan_AddItem_0.WindowTitle=Add Include/Exclude
13 years, 9 months