JBoss Tools SVN: r15073 - trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-05-06 09:38:44 -0400 (Wed, 06 May 2009)
New Revision: 15073
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JDTuiAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4264 - add Hibernate/JPA tests to JDTuiAllTests
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JDTuiAllTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JDTuiAllTests.java 2009-05-06 13:29:55 UTC (rev 15072)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JDTuiAllTests.java 2009-05-06 13:38:44 UTC (rev 15073)
@@ -16,6 +16,8 @@
suite.addTestSuite(HQLQueryValidatorTest.class);
suite.addTestSuite(ELTransformerTest.class);
suite.addTestSuite(HbmExporterTest.class);
+ suite.addTestSuite(JPAMapMockTests.class);
+ suite.addTestSuite(JPAMapTest.class);
//$JUnit-END$
return suite;
}
15 years, 1 month
JBoss Tools SVN: r15072 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-05-06 09:29:55 -0400 (Wed, 06 May 2009)
New Revision: 15072
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/MozillaPreview.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
issue JBIDE-4256: Make VPE error message more information and user friendly
https://jira.jboss.org/jira/browse/JBIDE-4256
- the messages changed
- the link updated
- cut-and-paste code removed
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 2009-05-06 12:59:36 UTC (rev 15071)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-05-06 13:29:55 UTC (rev 15072)
@@ -106,7 +106,6 @@
private IVpeToolBarManager vpeToolBarManager;
private FormatControllerManager formatControllerManager = new FormatControllerManager();
private VpeController controller;
- private Link link = null;
private boolean isRefreshPage = false;
private String doctype;
@@ -422,50 +421,8 @@
}
catch (XulRunnerException e) {
- VpePlugin.getPluginLog().logError(e);
-
- layout.verticalSpacing = 10;
- Label title = new Label(cmpEd, SWT.WRAP);
- title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR);
- title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- link = new Link(cmpEd, SWT.WRAP);
- link.setText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK_TEXT);
- link.setToolTipText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK);
- link.setForeground(link.getDisplay().getSystemColor(SWT.COLOR_BLUE));
- link.addMouseListener(new MouseListener() {
- public void mouseDown(org.eclipse.swt.events.MouseEvent e) {
- BusyIndicator.showWhile(link.getDisplay(), new Runnable() {
- public void run() {
- URL theURL=null;;
- try {
- theURL = new URL(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK);
- } catch (MalformedURLException e) {
- VpePlugin.reportProblem(e);
- }
- IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport();
- try {
- support.getExternalBrowser().openURL(theURL);
- } catch (PartInitException e) {
- VpePlugin.reportProblem(e);
- }
- }
- });
- }
-
- public void mouseDoubleClick(MouseEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- public void mouseUp(MouseEvent e) {
- // TODO Auto-generated method stub
-
- }
- });
- link.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Label fill = new Label(cmpEd, SWT.WRAP);
- fill.setLayoutData(new GridData(GridData.FILL_BOTH));
+ layout.verticalSpacing = 10;
+ showXulRunnerException(cmpEd, e);
}
/*
@@ -479,6 +436,53 @@
sc.setMinSize(totalSize);
}
+ /**
+ * Logs given {@code exception} and shows error message in
+ * the {@code parent} composite.
+ */
+ protected void showXulRunnerException(Composite parent,
+ XulRunnerException exception) {
+ VpePlugin.getPluginLog().logError(
+ VpeUIMessages.MOZILLA_LOADING_ERROR_LOG_ENTRY, exception);
+
+ Label title = new Label(parent, SWT.WRAP);
+ title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR);
+ title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ final Link link = new Link(parent, SWT.WRAP);
+ link.setText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK_TEXT);
+ link.setToolTipText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK);
+ link.setForeground(link.getDisplay().getSystemColor(SWT.COLOR_BLUE));
+ link.addMouseListener(new MouseListener() {
+ public void mouseDown(org.eclipse.swt.events.MouseEvent e) {
+ BusyIndicator.showWhile(link.getDisplay(), new Runnable() {
+ public void run() {
+ URL theURL=null;;
+ try {
+ theURL = new URL(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK);
+ } catch (MalformedURLException e) {
+ VpePlugin.reportProblem(e);
+ }
+ IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport();
+ try {
+ support.getExternalBrowser().openURL(theURL);
+ } catch (PartInitException e) {
+ VpePlugin.reportProblem(e);
+ }
+ }
+ });
+ }
+
+ public void mouseDoubleClick(MouseEvent e) {
+ }
+ public void mouseUp(MouseEvent e) {
+ }
+ });
+ link.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ Label fill = new Label(parent, SWT.WRAP);
+ fill.setLayoutData(new GridData(GridData.FILL_BOTH));
+ }
+
private ToolItem createToolItem(ToolBar parent, int type, String image,
String toolTipText) {
ToolItem item = new ToolItem(parent, type);
@@ -752,20 +756,6 @@
}
/**
- * @return the link
- */
- protected Link getLink() {
- return link;
- }
-
- /**
- * @param link the link to set
- */
- protected void setLink(Link link) {
- this.link = link;
- }
-
- /**
* @return the contentAreaEventTarget
*/
public nsIDOMEventTarget getContentAreaEventTarget() {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2009-05-06 12:59:36 UTC (rev 15071)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2009-05-06 13:29:55 UTC (rev 15072)
@@ -10,24 +10,12 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.mozilla;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.editor.VpePreviewDomBuilder;
import org.jboss.tools.vpe.editor.VpeSourceDomBuilder;
@@ -37,7 +25,6 @@
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
-import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.xulrunner.XulRunnerException;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
@@ -96,43 +83,7 @@
getEditorInput()));
getXulRunnerEditor().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
} catch (XulRunnerException e) {
- Label title = new Label(parent, SWT.WRAP);
- title.setText(VpeUIMessages.MOZILLA_LOADING_ERROR);
- title.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- setLink(new Link(parent, SWT.WRAP));
- getLink().setText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK_TEXT);
- getLink().setToolTipText(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK);
- getLink().setForeground(getLink().getDisplay().getSystemColor(SWT.COLOR_BLUE));
- getLink().addMouseListener(new MouseListener() {
- public void mouseDown(org.eclipse.swt.events.MouseEvent e) {
- BusyIndicator.showWhile(getLink().getDisplay(), new Runnable() {
- public void run() {
- URL theURL=null;;
- try {
- theURL = new URL(VpeUIMessages.MOZILLA_LOADING_ERROR_LINK);
- } catch (MalformedURLException e) {
- VpePlugin.reportProblem(e);
- }
- IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport();
- try {
- support.getExternalBrowser().openURL(theURL);
- } catch (PartInitException e) {
- VpePlugin.reportProblem(e);
- }
- }
- });
- }
-
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- public void mouseUp(MouseEvent e) {
- }
- });
- getLink().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Label fill = new Label(parent, SWT.WRAP);
- fill.setLayoutData(new GridData(GridData.FILL_BOTH));
+ showXulRunnerException(parent, e);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-05-06 12:59:36 UTC (rev 15071)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-05-06 13:29:55 UTC (rev 15072)
@@ -26,6 +26,7 @@
public static String PAGE_DESIGN_OPTIONS;
public static String HIDE_SELECTION_BAR;
public static String SHOW_SELECTION_BAR;
+ public static String MOZILLA_LOADING_ERROR_LOG_ENTRY;
public static String MOZILLA_LOADING_ERROR;
public static String MOZILLA_LOADING_ERROR_LINK_TEXT;
public static String MOZILLA_LOADING_ERROR_LINK;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-05-06 12:59:36 UTC (rev 15071)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-05-06 13:29:55 UTC (rev 15072)
@@ -4,10 +4,12 @@
PAGE_DESIGN_OPTIONS=Page Design Options
HIDE_SELECTION_BAR=Hide Selection Bar
SHOW_SELECTION_BAR=Show Selection Bar
-MOZILLA_LOADING_ERROR=The VPE editor can't be run because your system environment needs to be changed slightly.
+MOZILLA_LOADING_ERROR_LOG_ENTRY=Cannot run the Visual Page Editor
+MOZILLA_LOADING_ERROR=Cannot run the Visual Page Editor. See the Error Log view for the stack trace of the error.\n\
+ Probably your system environment needs to be slightly changed.
MOZILLA_LOADING_ERROR_LINK_TEXT=Find out more.
# START NON-TRANSLATABLE
-MOZILLA_LOADING_ERROR_LINK=http://labs.jboss.com/wiki/JBosstoolsVisualEditorFAQ
+MOZILLA_LOADING_ERROR_LINK=http://www.jboss.org/community/docs/DOC-10862
# END NON-TRANSLATABLE
GENERAL=General
TEMPLATES=Templates
15 years, 1 month
JBoss Tools SVN: r15071 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-05-06 08:59:36 -0400 (Wed, 06 May 2009)
New Revision: 15071
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-4156 - committed to branch
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-05-06 12:51:05 UTC (rev 15070)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-05-06 12:59:36 UTC (rev 15071)
@@ -130,14 +130,6 @@
else
list.addAll(Arrays.asList(packModuleIntoJar(moduleTree[moduleTree.length-1], deployPath)));
- if( list.size() > 0 ) {
- MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FULL_FAIL,
- "Full Publish Failed for module " + module.getName(), null);
- for( int i = 0; i < list.size(); i++ )
- ms.add(list.get(i));
- return ms;
- }
-
// adjust timestamps
FileFilter filter = new FileFilter() {
@@ -148,6 +140,17 @@
}
};
FileUtil.touch(filter, deployPath.toFile(), true);
+
+
+ if( list.size() > 0 ) {
+ MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FULL_FAIL,
+ "Full Publish Failed for module " + module.getName(), null);
+ for( int i = 0; i < list.size(); i++ )
+ ms.add(list.get(i));
+ return ms;
+ }
+
+
publishState = IServer.PUBLISH_STATE_NONE;
IStatus ret = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FULL_SUCCESS,
15 years, 1 month
JBoss Tools SVN: r15070 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-05-06 08:51:05 -0400 (Wed, 06 May 2009)
New Revision: 15070
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-4156
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-05-06 12:39:55 UTC (rev 15069)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-05-06 12:51:05 UTC (rev 15070)
@@ -124,6 +124,16 @@
else
list.addAll(Arrays.asList(packModuleIntoJar(moduleTree[moduleTree.length-1], deployPath)));
+ // adjust timestamps
+ FileFilter filter = new FileFilter() {
+ public boolean accept(File pathname) {
+ if( pathname.getAbsolutePath().toLowerCase().endsWith(IConstants.EXT_XML))
+ return true;
+ return false;
+ }
+ };
+ FileUtil.touch(filter, deployPath.toFile(), true);
+
if( list.size() > 0 ) {
MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FULL_FAIL,
NLS.bind(Messages.FullPublishFail, module.getName()), null);
@@ -133,15 +143,6 @@
}
- // adjust timestamps
- FileFilter filter = new FileFilter() {
- public boolean accept(File pathname) {
- if( pathname.getAbsolutePath().toLowerCase().endsWith(IConstants.EXT_XML))
- return true;
- return false;
- }
- };
- FileUtil.touch(filter, deployPath.toFile(), true);
publishState = IServer.PUBLISH_STATE_NONE;
IStatus ret = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FULL_SUCCESS,
15 years, 1 month
JBoss Tools SVN: r15069 - in trunk/hibernatetools: tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-05-06 08:39:55 -0400 (Wed, 06 May 2009)
New Revision: 15069
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4264
Recommit changes and fixed broken test.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-05-06 12:01:25 UTC (rev 15068)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-05-06 12:39:55 UTC (rev 15069)
@@ -512,6 +512,7 @@
while (itVarNames.hasNext()) {
String name = (String)itVarNames.next();
entityInfo.updateAnnotationColumn(name, null, false);
+ entityInfo.addPrimaryIdCandidate(name);
}
}
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java 2009-05-06 12:01:25 UTC (rev 15068)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java 2009-05-06 12:39:55 UTC (rev 15069)
@@ -14,7 +14,7 @@
public abstract class DocumentBase {
- protected String globalDocumentIdentificator;
+ protected boolean globalDocumentIdentificator;
protected Integer version;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java 2009-05-06 12:01:25 UTC (rev 15068)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java 2009-05-06 12:39:55 UTC (rev 15069)
@@ -15,7 +15,7 @@
@javax.persistence.MappedSuperclass
public abstract class DocumentBase {
- protected String globalDocumentIdentificator;
+ protected boolean globalDocumentIdentificator;
protected Integer version;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-05-06 12:01:25 UTC (rev 15068)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-05-06 12:39:55 UTC (rev 15069)
@@ -10,16 +10,14 @@
******************************************************************************/
package test.annotated.fields;
-import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
@MappedSuperclass
public abstract class DocumentBase {
+
+ protected boolean globalDocumentIdentificator;
- @Column(length=200)
- protected String globalDocumentIdentificator;
-
@Version
protected Integer version;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java 2009-05-06 12:01:25 UTC (rev 15068)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java 2009-05-06 12:39:55 UTC (rev 15069)
@@ -15,7 +15,7 @@
@javax.persistence.MappedSuperclass
public abstract class DocumentBase {
- protected String globalDocumentIdentificator;
+ protected boolean globalDocumentIdentificator;
protected Integer version;
15 years, 1 month
JBoss Tools SVN: r15068 - trunk/seam/plugins/org.jboss.tools.seam.core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-05-06 08:01:25 -0400 (Wed, 06 May 2009)
New Revision: 15068
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4274 Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-05-06 11:28:02 UTC (rev 15067)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-05-06 12:01:25 UTC (rev 15068)
@@ -418,12 +418,30 @@
class="org.jboss.tools.seam.internal.core.refactoring.SeamProjectRenameParticipant"
id="org.jboss.tools.seam.internal.core.refactoring.SeamProjectRenameParticipant"
name="seam-RenameProjectParticipant">
- <enablement>
- <with variable="element">
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- </or>
- </with>
+ <enablement>
+ <and>
+ <or>
+ <with variable="processorIdentifier">
+ <or>
+ <equals
+ value="org.eclipse.jdt.ui.renameJavaProjectProcessor">
+ </equals>
+ </or>
+ </with>
+ <with variable="processorIdentifier">
+ <or>
+ <equals
+ value="org.eclipse.ltk.core.refactoring.renameResourceProcessor">
+ </equals>
+ </or>
+ </with>
+ </or>
+ <with variable="element">
+ <or>
+ <instanceof value="org.eclipse.core.resources.IProject"/>
+ </or>
+ </with>
+ </and>
</enablement>
</renameParticipant>
<renameParticipant
@@ -474,4 +492,4 @@
class="org.jboss.tools.seam.internal.core.el.VariableResolver"
id="org.jboss.tools.seam.el.variableresolver"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
15 years, 1 month
JBoss Tools SVN: r15067 - in trunk/jsf/docs/jsf_tools_tutorial/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-05-06 07:28:02 -0400 (Wed, 06 May 2009)
New Revision: 15067
Modified:
trunk/jsf/docs/jsf_tools_tutorial/en/images/jsf_application/jsf_application_10.png
trunk/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml
trunk/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-707 - Screens update. Inline graphic. JSF Tools Tutorial was updated with inline graphic.</p>
</body></html>
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/images/jsf_application/jsf_application_10.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml 2009-05-06 11:19:09 UTC (rev 15066)
+++ trunk/jsf/docs/jsf_tools_tutorial/en/modules/adding_navigation.xml 2009-05-06 11:28:02 UTC (rev 15067)
@@ -69,18 +69,14 @@
<itemizedlist>
<listitem>
<para>In the diagram, select the connection icon third from the top along
- the upper left side of the diagram</para>
+ the upper left side of the diagram (<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_application/jsf_application_3.png"/>
+ </imageobject>
+ </inlinemediaobject>) to get an arrow cursor with a two-pronged plug at the arrow's bottom.</para>
</listitem>
</itemizedlist>
- <figure>
- <title>Connection Icon</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_application/jsf_application_3.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>to get an arrow cursor with a two-pronged plug at the arrow's bottom.</para>
+
<itemizedlist>
<listitem>
<para>Click on the <emphasis>
@@ -108,5 +104,5 @@
</listitem>
</itemizedlist>
</section>
-
+
</chapter>
\ No newline at end of file
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml 2009-05-06 11:19:09 UTC (rev 15066)
+++ trunk/jsf/docs/jsf_tools_tutorial/en/modules/running_application.xml 2009-05-06 11:28:02 UTC (rev 15067)
@@ -30,19 +30,16 @@
</listitem>
<listitem>
- <para>Click the Run icon or right click your project folder and select <emphasis>
+ <para>Click the Run icon(<inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/jsf_application/jsf_application_10.png"/>
+ </imageobject>
+ </inlinemediaobject>) or right click your project folder and select <emphasis>
<property>Run As > Run on Server</property>
</emphasis>:</para>
</listitem>
</itemizedlist>
- <figure>
- <title>Run Icon</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/jsf_application/jsf_application_10.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+
<para>This is the equivalent of launching the browser and typing <emphasis>
<property>http://localhost:8080/jsfHello</property>
</emphasis> into your browser. Our <property>JSF application</property> should now
15 years, 1 month
JBoss Tools SVN: r15066 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-05-06 07:19:09 -0400 (Wed, 06 May 2009)
New Revision: 15066
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4264 - revert last changes back - cause broken unit test - JPAMapTest
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-05-06 09:58:45 UTC (rev 15065)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-05-06 11:19:09 UTC (rev 15066)
@@ -512,7 +512,6 @@
while (itVarNames.hasNext()) {
String name = (String)itVarNames.next();
entityInfo.updateAnnotationColumn(name, null, false);
- entityInfo.addPrimaryIdCandidate(name);
}
}
}
15 years, 1 month
JBoss Tools SVN: r15065 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-05-06 05:58:45 -0400 (Wed, 06 May 2009)
New Revision: 15065
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/DeployableServer.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/wizards/JBossServerWizardFragment.java
Log:
JBIDE-4275 - removing duplicate "name" section.
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 2009-05-06 09:45:22 UTC (rev 15064)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2009-05-06 09:58:45 UTC (rev 15065)
@@ -19,6 +19,9 @@
public static String jboss;
public static String server;
public static String runtime;
+ public static String serverVersionName;
+ public static String serverName;
+ public static String serverCountName;
public static String runModeNotSupported;
public static String loadXMLDocumentFailed;
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 2009-05-06 09:45:22 UTC (rev 15064)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2009-05-06 09:58:45 UTC (rev 15065)
@@ -1,5 +1,8 @@
jboss=JBoss
server=Server
+serverVersionName=JBoss {0} Server
+serverName={0} Server
+serverCountName={0} ({1})
runtime=Runtime
securityException=Security Exception: {0}
JMXPoller=JMX Poller
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2009-05-06 09:45:22 UTC (rev 15064)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2009-05-06 09:58:45 UTC (rev 15065)
@@ -24,7 +24,6 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerPort;
import org.eclipse.wst.server.core.model.ServerDelegate;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.IWTPConstants;
@@ -40,6 +39,10 @@
}
public void setDefaults(IProgressMonitor monitor) {
+ IRuntime rt = getServer().getRuntime();
+ if( rt != null ) {
+ getServerWorkingCopy().setName(ServerUtil.getDefaultServerName(rt));
+ }
}
public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
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 2009-05-06 09:45:22 UTC (rev 15064)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2009-05-06 09:58:45 UTC (rev 15065)
@@ -13,12 +13,14 @@
import java.io.File;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -101,4 +103,31 @@
newTempAsGlobal.toFile().mkdirs();
}
}
+
+ public static IServer findServer(String name) {
+ IServer[] servers = ServerCore.getServers();
+ for( int i = 0; i < servers.length; i++ ) {
+ if (name.trim().equals(servers[i].getName()))
+ return servers[i];
+ }
+ return null;
+ }
+
+ public static String getDefaultServerName(IRuntime rt) {
+ String runtimeName = rt.getName();
+ String base = null;
+ if( runtimeName == null || runtimeName.equals("")) //$NON-NLS-1$
+ base = NLS.bind(Messages.serverVersionName, rt.getRuntimeType().getVersion());
+ else
+ base = NLS.bind(Messages.serverName, runtimeName);
+
+ if( ServerUtil.findServer(base) == null ) return base;
+ int i = 1;
+ while( ServerUtil.findServer(
+ NLS.bind(Messages.serverCountName, base, i)) != null )
+ i++;
+ return NLS.bind(Messages.serverCountName, base, i);
+ }
+
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-06 09:45:22 UTC (rev 15064)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-06 09:58:45 UTC (rev 15065)
@@ -60,15 +60,12 @@
*/
public class JBossServerWizardFragment extends WizardFragment {
private IWizardHandle handle;
- private String name;
- private Label nameLabel, serverExplanationLabel,
+ private Label serverExplanationLabel,
runtimeExplanationLabel;
private Label homeDirLabel, installedJRELabel, configLabel;
private Label homeValLabel, jreValLabel, configValLabel;
- private Composite nameComposite;
private Group runtimeGroup;
- private Text nameText;
public Composite createComposite(Composite parent, IWizardHandle handle) {
this.handle = handle;
@@ -76,7 +73,6 @@
main.setLayout(new FormLayout());
createExplanationLabel(main);
- createNameComposite(main);
createRuntimeGroup(main);
// make modifications to parent
@@ -122,71 +118,7 @@
serverExplanationLabel.setText(Messages.swf_Explanation);
}
- private void createNameComposite(Composite main) {
- // Create our name composite
- nameComposite = new Composite(main, SWT.NONE);
-
- FormData cData = new FormData();
- cData.left = new FormAttachment(0,5);
- cData.right = new FormAttachment(100,-5);
- cData.top = new FormAttachment(serverExplanationLabel, 10);
- nameComposite.setLayoutData(cData);
-
- nameComposite.setLayout(new FormLayout());
-
- // create internal widgets
- nameLabel = new Label(nameComposite, SWT.None);
- nameLabel.setText(Messages.wf_NameLabel);
-
- nameText = new Text(nameComposite, SWT.BORDER);
- name = getDefaultNameText();
- nameText.setText(name);
- nameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- name = nameText.getText();
- updateErrorMessage();
- }
- });
-
- // organize widgets inside composite
- FormData nameLabelData = new FormData();
- nameLabelData.left = new FormAttachment(0,0);
- nameLabel.setLayoutData(nameLabelData);
-
- FormData nameTextData = new FormData();
- nameTextData.left = new FormAttachment(0, 5);
- nameTextData.right = new FormAttachment(100, -5);
- nameTextData.top = new FormAttachment(nameLabel, 5);
- nameText.setLayoutData(nameTextData);
- }
-
- private String getDefaultNameText() {
- IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- String name = rt.getName();
- String base = null;
- if( name == null || name.equals(""))
- base = Messages.swf_BaseName.replace(Messages.wf_BaseNameVersionReplacement, rt.getRuntimeType().getVersion());
- else if( name.endsWith(org.jboss.ide.eclipse.as.core.Messages.runtime))
- base = name.substring(0, name.indexOf(org.jboss.ide.eclipse.as.core.Messages.runtime)) + org.jboss.ide.eclipse.as.core.Messages.server;
- else
- base = name + " " + org.jboss.ide.eclipse.as.core.Messages.server;
-
- if( findServer(base) == null ) return base;
- int i = 1;
- while( findServer(base + " (" + i + ")") != null )
- i++;
- return base + " (" + i + ")";
- }
- private IServer findServer(String name) {
- IServer[] servers = ServerCore.getServers();
- for( int i = 0; i < servers.length; i++ ) {
- if (name.trim().equals(servers[i].getName()))
- return servers[i];
- }
- return null;
- }
-
private void createRuntimeGroup(Composite main) {
runtimeGroup = new Group(main, SWT.NONE);
@@ -194,7 +126,7 @@
FormData groupData = new FormData();
groupData.left = new FormAttachment(0,5);
groupData.right = new FormAttachment(100, -5);
- groupData.top = new FormAttachment(nameComposite, 5);
+ groupData.top = new FormAttachment(serverExplanationLabel, 5);
runtimeGroup.setLayoutData(groupData);
runtimeGroup.setLayout(new GridLayout(2, false));
@@ -236,8 +168,6 @@
}
private String getErrorString() {
- if( findServer(name) != null )
- return Messages.swf_NameInUse;
return null;
}
@@ -245,8 +175,6 @@
public void enter() {
if(homeValLabel !=null && !homeValLabel.isDisposed()) {
IJBossServerRuntime srt = getRuntime();
- name = name == null ? getDefaultNameText() : name;
- nameText.setText(name);
homeValLabel.setText(srt.getRuntime().getLocation().toOSString());
configValLabel.setText(srt.getJBossConfiguration());
jreValLabel.setText(srt.getVM().getInstallLocation().getAbsolutePath() + " (" + srt.getVM().getName() + ")");
@@ -260,13 +188,11 @@
public void performFinish(IProgressMonitor monitor) throws CoreException {
IServerWorkingCopy serverWC = (IServerWorkingCopy) getTaskModel().getObject(TaskModel.TASK_SERVER);
- name = name == null ? getDefaultNameText() : name;
JBossServer jbs = (JBossServer)serverWC.loadAdapter(JBossServer.class, new NullProgressMonitor());
jbs.setUsername("admin");
jbs.setPassword("admin");
jbs.setDeployLocationType(isAS5() ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA);
serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME));
- serverWC.setName(name);
serverWC.setServerConfiguration(null); // no inside jboss folder
IServer saved = serverWC.save(false, new NullProgressMonitor());
15 years, 1 month
JBoss Tools SVN: r15064 - trunk/seam/docs/reference/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-05-06 05:45:22 -0400 (Wed, 06 May 2009)
New Revision: 15064
Modified:
trunk/seam/docs/reference/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-134 - adding the FAQ chapter for the Seam Tools guide;
Modified: trunk/seam/docs/reference/en/master.xml
===================================================================
--- trunk/seam/docs/reference/en/master.xml 2009-05-06 09:44:29 UTC (rev 15063)
+++ trunk/seam/docs/reference/en/master.xml 2009-05-06 09:45:22 UTC (rev 15064)
@@ -16,8 +16,8 @@
<!ENTITY crud_application_walkthrough SYSTEM "modules/crud_application_walkthrough.xml">
<!ENTITY business_application SYSTEM "modules/business_application.xml">
<!ENTITY testng SYSTEM "modules/testng.xml">
+<!ENTITY seam_faq SYSTEM "modules/seam_faq.xml">
-
<!ENTITY seamlink "../../seam/html_single/index.html">
<!ENTITY aslink "../../as/html_single/index.html">
<!ENTITY esblink "../../esb_ref_guide/html_single/index.html">
@@ -39,8 +39,8 @@
<title>Seam Dev Tools Reference Guide</title>
<author><firstname>Anatoly</firstname><surname>Fedosik</surname></author>
<author><firstname>Olga</firstname><surname>Chikvina</surname></author>
- <author><firstname>Michael</firstname><surname>Sorokin</surname></author>
-
+ <author><firstname>Michael</firstname><surname>Sorokin</surname></author>
+
<author><firstname>Svetlana</firstname><surname>Mukhina</surname><email>smukhina(a)exadel.com</email></author>
<pubdate>April 2008</pubdate>
@@ -77,6 +77,7 @@
&crud_database_application;
&crud_application_walkthrough;
&testng;
+&seam_faq;
<!-- TODO: drools used in this section is not available for eclipse .3.3 &business_application; -->
</book>
15 years, 1 month