JBoss Tools SVN: r6513 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-21 16:19:29 -0500 (Thu, 21 Feb 2008)
New Revision: 6513
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java
Log:
JBIDE-1793 - also fixed to use more standard wtp api
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2008-02-21 17:50:57 UTC (rev 6512)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2008-02-21 21:19:29 UTC (rev 6513)
@@ -22,9 +22,13 @@
package org.jboss.ide.eclipse.as.ui.actions;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.BaseLabelProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
@@ -37,7 +41,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.MessageBox;
@@ -47,13 +50,12 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.internal.PublishServerJob;
import org.eclipse.wst.server.ui.internal.ImageResource;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
-import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
/**
*
@@ -71,26 +73,52 @@
public void run(IAction action) {
IServer server = getServer();
+ IStatus errorStatus = null;
+ String errorTitle, errorMessage;
+ errorTitle = errorMessage = null;
+
if( selection instanceof IStructuredSelection ) {
- Object element = ((IStructuredSelection)selection).getFirstElement();
+ IStructuredSelection sel2 = (IStructuredSelection)selection;
+ Object[] objs = sel2.toArray();
if( server == null ) {
- MessageBox messageBox = new MessageBox (new Shell(), SWT.OK );
- messageBox.setText ("Cannot Publish To Server");
- messageBox.setMessage ("No deployable servers located.");
- messageBox.open();
- } else if( element != null && element instanceof IFile ) {
- IFile tmp = (IFile)element;
- SingleDeployableFactory factory = SingleDeployableFactory.getFactory();
- factory.makeDeployable(tmp.getFullPath());
- IModule module = factory.findModule(tmp.getFullPath());
- DeployableServerBehavior behavior = (DeployableServerBehavior)
- server.loadAdapter(DeployableServerBehavior.class, new NullProgressMonitor());
- if( module != null && behavior != null ) {
- behavior.publishOneModule(new IModule[]{module}, IServer.PUBLISH_FULL, ServerBehaviourDelegate.CHANGED, false, new NullProgressMonitor());
+ errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, "No deployable servers located");
+ errorTitle = "Cannot Publish To Server";
+ errorMessage = "No deployable servers located";
+ } else if( objs == null || !allFiles(objs) ) {
+ errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, "One or more selected objects are not Files");
+ errorTitle = "Cannot Publish To Server";
+ errorMessage = "Only File resources may be published.\nOne or more selected objects are not Files.";
+ } else {
+ IModule[] modules = new IModule[objs.length];
+ for( int i = 0; i < objs.length; i++ ) {
+ SingleDeployableFactory.makeDeployable(((IFile)objs[i]).getFullPath());
+ modules[i] = SingleDeployableFactory.findModule(((IFile)objs[i]).getFullPath());
}
+ try {
+ IServerWorkingCopy copy = server.createWorkingCopy();
+ copy.modifyModules(modules, new IModule[0], new NullProgressMonitor());
+ IServer saved = copy.save(false, new NullProgressMonitor());
+ PublishServerJob job = new PublishServerJob(saved);
+ job.schedule();
+ } catch( CoreException ce ) {
+ errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, "Publishing files to server failed", ce);
+ errorTitle = "Cannot Publish to Server";
+ errorMessage = "Publishing files to server failed";
+ }
}
}
+ if( errorStatus != null ) {
+ ErrorDialog dialog = new ErrorDialog(new Shell(), errorTitle, errorMessage, errorStatus, 0xFFFF);
+ dialog.open();
+ }
}
+
+ protected boolean allFiles(Object[] objs) {
+ for( int i = 0; i < objs.length; i++ )
+ if( !(objs[i] instanceof IFile) )
+ return false;
+ return true;
+ }
protected IServer getServer() {
18 years, 1 month
JBoss Tools SVN: r6512 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-02-21 12:50:57 -0500 (Thu, 21 Feb 2008)
New Revision: 6512
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
Log:
JBIDE-1808 Fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-02-21 17:42:41 UTC (rev 6511)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-02-21 17:50:57 UTC (rev 6512)
@@ -714,27 +714,25 @@
final XModelObject o = b == null ? null : b.source();
Display.getDefault().asyncExec(new Runnable() {
public void run() {
-// if (parentEditor.getVisualEditor().getController() != null) {
- if(o != null && !XModelTransferBuffer.getInstance().isEnabled()) {
- XModelTransferBuffer.getInstance().enable();
- XModelTransferBuffer.getInstance().getBuffer().addSource(o);
- }
- try {
- DropData dropData = new DropData(flavor,
- data,
- getEditorInput(), getSourceViewer(),
- getSelectionProvider());
- dropData.setAttributeName(dropContext.getAttributeName());
- IDropCommand dropCommand = DropCommandFactory.getInstance().getDropCommand(flavor, JSPTagProposalFactory.getInstance());
+ if(o != null && !XModelTransferBuffer.getInstance().isEnabled()) {
+ XModelTransferBuffer.getInstance().enable();
+ XModelTransferBuffer.getInstance().getBuffer().addSource(o);
+ }
+ try {
+ DropData dropData = new DropData(flavor,
+ data,
+ getEditorInput(), getSourceViewer(),
+ getSelectionProvider());
+ dropData.setAttributeName(dropContext.getAttributeName());
+ IDropCommand dropCommand = DropCommandFactory.getInstance().getDropCommand(flavor, JSPTagProposalFactory.getInstance());
- boolean promptAttributes = "yes".equals(VpePreference.ALWAYS_REQUEST_FOR_ATTRIBUTE.getValue());
- dropCommand.getDefaultModel().setPromptForTagAttributesRequired(promptAttributes);
- dropCommand.execute(dropData);
- } finally {
- XModelTransferBuffer.getInstance().disable();
- }
+ boolean promptAttributes = "yes".equals(VpePreference.ALWAYS_REQUEST_FOR_ATTRIBUTE.getValue());
+ dropCommand.getDefaultModel().setPromptForTagAttributesRequired(promptAttributes);
+ dropCommand.execute(dropData);
+ } finally {
+ XModelTransferBuffer.getInstance().disable();
}
-// }
+ }
});
}
18 years, 1 month
JBoss Tools SVN: r6511 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-02-21 12:42:41 -0500 (Thu, 21 Feb 2008)
New Revision: 6511
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1808 Fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-02-21 17:19:25 UTC (rev 6510)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-02-21 17:42:41 UTC (rev 6511)
@@ -714,7 +714,7 @@
final XModelObject o = b == null ? null : b.source();
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- if (parentEditor.getVisualEditor().getController() != null) {
+// if (parentEditor.getVisualEditor().getController() != null) {
if(o != null && !XModelTransferBuffer.getInstance().isEnabled()) {
XModelTransferBuffer.getInstance().enable();
XModelTransferBuffer.getInstance().getBuffer().addSource(o);
@@ -734,7 +734,7 @@
XModelTransferBuffer.getInstance().disable();
}
}
- }
+// }
});
}
18 years, 1 month
JBoss Tools SVN: r6508 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-21 11:49:39 -0500 (Thu, 21 Feb 2008)
New Revision: 6508
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
JBIDE-1670 Drop down selector for bus-id-ref added.
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-02-21 16:49:32 UTC (rev 6507)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-02-21 16:49:39 UTC (rev 6508)
@@ -1294,7 +1294,10 @@
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true" name="name" xmlname="name"/>
- <XModelAttribute PROPERTIES="category=general" name="bus id ref" xmlname="busidref"/>
+ <XModelAttribute PROPERTIES="category=general" name="bus id ref" xmlname="busidref">
+ <Constraint loader="ListString"/>
+ <Editor name="ESBBusList"/>
+ </XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads"/>
<XModelAttribute PROPERTIES="category=general" name="is gateway" xmlname="is-gateway">
<Constraint loader="ListString">
@@ -1442,16 +1445,13 @@
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
<XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ <XActionItem BaseActionName="Delete"
+ HandlerClassName="%DeleteChildren%" ICON="action.delete"
+ displayName="Delete" kind="action" name="Delete"/>
</XActionItem>
<XActionItemReference entity="ESBProperty" name="Properties"/>
</XActionItem>
@@ -1646,7 +1646,10 @@
kind="action" name="AddAnyProvider"/>
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <XActionItemReference entity="ESBProperty" name="CopyActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
+ </XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
<XActionItem BaseActionName="Delete"
HandlerClassName="%DeleteChildren%" ICON="action.delete"
@@ -2011,10 +2014,6 @@
</XActionItem>
<XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
<XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
18 years, 1 month
JBoss Tools SVN: r6507 - in trunk/esb/plugins/org.jboss.tools.esb.ui: src/org/jboss/tools/esb/ui/editor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-21 11:49:32 -0500 (Thu, 21 Feb 2008)
New Revision: 6507
Added:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
Log:
JBIDE-1670 Drop down selector for bus-id-ref added.
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2008-02-21 16:30:15 UTC (rev 6506)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2008-02-21 16:49:32 UTC (rev 6507)
@@ -33,4 +33,11 @@
class="org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData"/>
</extension>
+ <extension point="org.jboss.tools.common.model.ui.attributeAdapter">
+ <attributeAdapter class="org.jboss.tools.esb.ui.editor.attribute.adapter.BusListAdapter" id="ESBBusList"/>
+ </extension>
+
+ <extension point="org.jboss.tools.common.model.ui.attributeEditor">
+ <attributeEditor class="org.jboss.tools.common.model.ui.attribute.editor.ComboBoxEditor" id="ESBBusList"/>
+ </extension>
</plugin>
Added: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/attribute/adapter/BusListAdapter.java 2008-02-21 16:49:32 UTC (rev 6507)
@@ -0,0 +1,51 @@
+package org.jboss.tools.esb.ui.editor.attribute.adapter;
+
+import java.util.TreeSet;
+
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.ui.attribute.IListContentProvider;
+import org.jboss.tools.common.model.ui.attribute.adapter.DefaultComboBoxValueAdapter;
+import org.jboss.tools.common.model.ui.attribute.adapter.DefaultXAttributeListContentProvider;
+
+public class BusListAdapter extends DefaultComboBoxValueAdapter {
+
+ protected IListContentProvider createListContentProvider(XAttribute attribute) {
+ BusListContentProvider p = new BusListContentProvider();
+ p.setContext(modelObject);
+ p.setAttribute(attribute);
+ return p;
+ }
+
+}
+
+class BusListContentProvider extends DefaultXAttributeListContentProvider {
+ private XModelObject context;
+
+ public void setContext(XModelObject context) {
+ this.context = context;
+ }
+
+ protected void loadTags() {
+ XModelObject f = context;
+ while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
+ if(f == null) return;
+ XModelObject[] ps = f.getChildByPath("Providers").getChildren();
+ TreeSet<String> set = new TreeSet<String>();
+ for (int i = 0; i < ps.length; i++) {
+ XModelObject[] cs = ps[i].getChildren();
+ for (int j = 0; j < cs.length; j++) {
+ if(cs[j].getModelEntity().getAttribute("bus id") != null) {
+ String v = cs[j].getAttributeValue("bus id");
+ if(v != null && v.length() > 0) {
+ set.add(v);
+ }
+ }
+ }
+ }
+ tags = set.toArray(new String[0]);
+
+ }
+
+}
+
18 years, 1 month
JBoss Tools SVN: r6506 - trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-21 11:30:15 -0500 (Thu, 21 Feb 2008)
New Revision: 6506
Modified:
trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java
Log:
JBIDE-1670 Tests added
Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2008-02-21 16:27:34 UTC (rev 6505)
+++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2008-02-21 16:30:15 UTC (rev 6506)
@@ -62,11 +62,7 @@
*/
public void testJMSExample() {
- IFile f = project.getFile(new Path("esb-1.0.1/jboss-esb-jms.xml"));
- assertTrue("Cannot find jboss-esb-jms.xml", f != null);
- XModelObject object = EclipseResourceUtil.createObjectForResource(f);
- assertTrue("Cannot create model for jboss-esb-jms.xml", object != null);
- assertTrue("Wrong entity for jboss-esb-jms.xml", ESBConstants.ENT_ESB_FILE_101.equals(object.getModelEntity().getName()));
+ XModelObject object = getFileObject("esb-1.0.1", "jboss-esb-jms.xml");
StringBuffer errorList = new StringBuffer();
checkAttributeValue(object,
@@ -89,11 +85,7 @@
}
public void testFTPExample() {
- IFile f = project.getFile(new Path("esb-1.0.1/jboss-esb-ftp.xml"));
- assertTrue("Cannot find jboss-esb-ftp.xml", f != null);
- XModelObject object = EclipseResourceUtil.createObjectForResource(f);
- assertTrue("Cannot create model for jboss-esb-ftp.xml", object != null);
- assertTrue("Wrong entity for jboss-esb-ftp.xml", ESBConstants.ENT_ESB_FILE_101.equals(object.getModelEntity().getName()));
+ XModelObject object = getFileObject("esb-1.0.1", "jboss-esb-ftp.xml");
StringBuffer errorList = new StringBuffer();
checkAttributeValue(object,
@@ -101,69 +93,32 @@
"hostname",
"@FTP_HOSTNAME@",
errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "username",
- "@FTP_USERNAME@",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "password",
- "@FTP_PASSWORD@",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "read only",
- "true",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "passive",
- "false",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "directory",
- "@FTP_DIRECTORY@",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "input suffix",
- ".dat",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "work suffix",
- ".esbWorking",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "post delete",
- "false",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "post suffix",
- ".COMPLETE",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "error delete",
- "false",
- errorList);
- checkAttributeValue(object,
- "Providers/FTPprovider/helloFTPChannel/Filter",
- "error suffix",
- ".HAS_ERROR",
- errorList);
+ String ftpFilterPath = "Providers/FTPprovider/helloFTPChannel/Filter";
+ String[][] ftpFilterAttrValues = {
+ {"username", "@FTP_USERNAME@"},
+ {"password", "@FTP_PASSWORD@"},
+ {"read only", "true"},
+ {"passive", "false"},
+ {"directory", "@FTP_DIRECTORY@"},
+ {"input suffix", ".dat"},
+ {"work suffix", ".esbWorking"},
+ {"post delete", "false"},
+ {"post suffix", ".COMPLETE"},
+ {"error delete", "false"},
+ {"error suffix", ".HAS_ERROR"},
+
+ };
+ checkAttributes(object, ftpFilterPath, ftpFilterAttrValues, errorList);
+
+ String ftpGatewayPath = "Services/myFileListener/Listeners/FtpGateway";
checkAttributeValue(object,
- "Services/myFileListener/Listeners/FtpGateway",
+ ftpGatewayPath,
"bus id ref",
"helloFTPChannel",
errorList);
checkAttributeValue(object,
- "Services/myFileListener/Listeners/FtpGateway/remoteFileSystemStrategy-configFile",
+ ftpGatewayPath + "/remoteFileSystemStrategy-configFile",
"value",
"/ftpfile-cache-config.xml",
errorList);
@@ -172,6 +127,151 @@
assertTrue(errorList.toString(), errorList.length() == 0);
}
+ public void testHibernateExample() {
+ XModelObject object = getFileObject("esb-1.0.1", "jboss-esb-hibernate.xml");
+ StringBuffer errorList = new StringBuffer();
+
+ String hibProviderPath = "Providers/Hibernateprovider";
+ checkAttributeValue(object,
+ hibProviderPath,
+ "hibernate cfg file",
+ "hibernate.cfg.xml",
+ errorList);
+
+ String hibFilterPath = hibProviderPath + "/helloHibernateChannel/org.jboss.soa.esb.samples.quickstart.hibernateaction.Order";
+ String[][] hibFilterAttrValues = {
+ {"class name", "org.jboss.soa.esb.samples.quickstart.hibernateaction.Order"},
+ {"event", "onLoad,onDelete"},
+ };
+ checkAttributes(object, hibFilterPath, hibFilterAttrValues, errorList);
+
+ String hibListenerPath = "Services/myJmsListener/Listeners/HibernateGateway";
+ String[][] hibListeneAttrValues = {
+ {"bus id ref", "helloHibernateChannel"},
+ {"max threads", "1"},
+ {"is gateway", "true"}
+ };
+ checkAttributes(object, hibListenerPath, hibListeneAttrValues, errorList);
+
+ assertTrue(errorList.toString(), errorList.length() == 0);
+ }
+
+ public void testJBRExample() {
+ XModelObject object = getFileObject("esb-1.0.1", "jboss-esb-jbr.xml");
+
+ StringBuffer errorList = new StringBuffer();
+
+ String jbrProviderPath = "Providers/JBR-Http";
+ String[][] jbrProviderAttrValues = {
+ {"protocol", "http"},
+ {"host", "localhost"},
+ };
+ checkAttributes(object, jbrProviderPath, jbrProviderAttrValues, errorList);
+
+ String jbrBusPath = jbrProviderPath + "/Http-1";
+ String[][] jbrBusAttrValues = {
+ {"port", "9876"},
+ };
+ checkAttributes(object, jbrBusPath, jbrBusAttrValues, errorList);
+
+ String jbrListenerPath = "Services/MyWssService/Listeners/Http-Gateway";
+ String[][] jbrListenerAttrValues = {
+ {"bus id ref", "Http-1"},
+ {"max threads", "1"},
+ {"is gateway", "true"},
+ };
+ checkAttributes(object, jbrListenerPath, jbrListenerAttrValues, errorList);
+
+ assertTrue(errorList.toString(), errorList.length() == 0);
+ }
+
+ public void testFSExample() {
+ XModelObject object = getFileObject("esb-1.0.1", "jboss-esb-fs.xml");
+
+ StringBuffer errorList = new StringBuffer();
+
+ String fsProviderPath = "Providers/FSprovider1";
+
+ String fsFilterPath = fsProviderPath + "/helloFileChannel/Filter";
+ String[][] fsFilterAttrValues = {
+ {"directory", "@INPUTDIR@"},
+ {"input suffix", ".dat"},
+ {"work suffix", ".esbWorking"},
+ {"post delete", "false"},
+ {"post directory", "@OUTPUTDIR@"},
+ {"post suffix", ".sentToEsb"},
+ {"error delete", "false"},
+ {"error directory", "@ERRORDIR@"},
+ {"error suffix", ".IN_ERROR"},
+
+ };
+ checkAttributes(object, fsFilterPath, fsFilterAttrValues, errorList);
+
+ String fsListenerPath = "Services/myFileListener/Listeners/FileGateway";
+ String[][] fsListenerAttrValues = {
+ {"bus id ref", "helloFileChannel"},
+ {"max threads", "1"},
+ {"is gateway", "true"},
+ {"poll frequency seconds", "10"}
+ };
+ checkAttributes(object, fsListenerPath, fsListenerAttrValues, errorList);
+
+ assertTrue(errorList.toString(), errorList.length() == 0);
+ }
+
+ public void testSQLExample() {
+ XModelObject object = getFileObject("esb-1.0.1", "jboss-esb-sql.xml");
+
+ StringBuffer errorList = new StringBuffer();
+
+ String sqlProviderPath = "Providers/SQLprovider";
+ String[][] sqlProviderAttrValues = {
+ {"url", "jdbc:hsqldb:hsql://localhost:1703"},
+ {"driver", "org.hsqldb.jdbcDriver"},
+ {"username", "sa"},
+ {"password", ""},
+ };
+ checkAttributes(object, sqlProviderPath, sqlProviderAttrValues, errorList);
+
+ String sqlFilterPath = "Providers/SQLprovider" + "/helloSQLChannel/Filter";
+ String[][] sqlFilterAttrValues = {
+ {"tablename", "GATEWAY_TABLE"},
+ {"status column", "STATUS_COL"},
+ {"order by", "DATA_COLUMN"},
+ {"where condition", "DATA_COLUMN like 'data%'"},
+ {"message id column", "UNIQUE_ID"}
+ };
+ checkAttributes(object, sqlFilterPath, sqlFilterAttrValues, errorList);
+
+ String sqlListenerPath = "Services/myJmsListener/Listeners/SqlGateway";
+ String[][] sqlListenerAttrValues = {
+ {"bus id ref", "helloSQLChannel"},
+ {"max threads", "1"},
+ {"is gateway", "true"}
+ };
+ checkAttributes(object, sqlListenerPath, sqlListenerAttrValues, errorList);
+
+ assertTrue(errorList.toString(), errorList.length() == 0);
+ }
+
+
+ XModelObject getFileObject(String parentPath, String xmlname) {
+ IFile f = project.getFile(new Path(parentPath + "/" + xmlname));
+ assertTrue("Cannot find " + xmlname, f != null);
+ XModelObject object = EclipseResourceUtil.createObjectForResource(f);
+ assertTrue("Cannot create model for " + xmlname, object != null);
+ assertTrue("Wrong entity for " + xmlname, ESBConstants.ENT_ESB_FILE_101.equals(object.getModelEntity().getName()));
+ return object;
+ }
+
+ void checkAttributes(XModelObject object, String path, String[][] attrValuePairs, StringBuffer errorList) {
+ for (int i = 0; i < attrValuePairs.length; i++) {
+ String attrName = attrValuePairs[i][0];
+ String attrValue = attrValuePairs[i][1];
+ checkAttributeValue(object, path, attrName, attrValue, errorList);
+ }
+ }
+
protected boolean checkAttributeValue(XModelObject object, String path, String attribute, String testValue, StringBuffer errorList) {
XModelObject child = object.getChildByPath(path);
if(child == null) {
18 years, 1 month
JBoss Tools SVN: r6505 - in trunk: as/docs/resources/support/lib and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-02-21 11:27:34 -0500 (Thu, 21 Feb 2008)
New Revision: 6505
Removed:
trunk/as/docs/resources/support/lib/highlight.jar
trunk/documentation/guides/resources/support/lib/highlight.jar
trunk/hibernatetools/docs/resources/support/lib/highlight.jar
trunk/jbpm/docs/resources/support/lib/highlight.jar
trunk/jsf/docs/resources/support/lib/highlight.jar
trunk/seam/docs/resources/support/lib/highlight.jar
Modified:
trunk/as/docs/resources/styles/en/html.xsl
trunk/as/docs/resources/styles/en/html_chunk.xsl
trunk/documentation/guides/resources/styles/en/html.xsl
trunk/documentation/guides/resources/styles/en/html_chunk.xsl
trunk/hibernatetools/docs/resources/styles/en/html.xsl
trunk/hibernatetools/docs/resources/styles/en/html_chunk.xsl
trunk/jbpm/docs/resources/styles/en/html.xsl
trunk/jbpm/docs/resources/styles/en/html_chunk.xsl
trunk/jsf/docs/resources/styles/en/html.xsl
trunk/jsf/docs/resources/styles/en/html_chunk.xsl
trunk/seam/docs/resources/styles/en/html.xsl
trunk/seam/docs/resources/styles/en/html_chunk.xsl
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
stylesheet is changed
Modified: trunk/as/docs/resources/styles/en/html.xsl
===================================================================
--- trunk/as/docs/resources/styles/en/html.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/as/docs/resources/styles/en/html.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -25,7 +25,7 @@
<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Modified: trunk/as/docs/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/as/docs/resources/styles/en/html_chunk.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/as/docs/resources/styles/en/html_chunk.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -26,7 +26,7 @@
<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Deleted: trunk/as/docs/resources/support/lib/highlight.jar
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/resources/styles/en/html.xsl
===================================================================
--- trunk/documentation/guides/resources/styles/en/html.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/documentation/guides/resources/styles/en/html.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -25,7 +25,7 @@
<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Modified: trunk/documentation/guides/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/documentation/guides/resources/styles/en/html_chunk.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/documentation/guides/resources/styles/en/html_chunk.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -26,7 +26,7 @@
<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Deleted: trunk/documentation/guides/resources/support/lib/highlight.jar
===================================================================
(Binary files differ)
Modified: trunk/hibernatetools/docs/resources/styles/en/html.xsl
===================================================================
--- trunk/hibernatetools/docs/resources/styles/en/html.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/hibernatetools/docs/resources/styles/en/html.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -25,7 +25,7 @@
<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Modified: trunk/hibernatetools/docs/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/hibernatetools/docs/resources/styles/en/html_chunk.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/hibernatetools/docs/resources/styles/en/html_chunk.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -26,7 +26,7 @@
<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Deleted: trunk/hibernatetools/docs/resources/support/lib/highlight.jar
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/resources/styles/en/html.xsl
===================================================================
--- trunk/jbpm/docs/resources/styles/en/html.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/jbpm/docs/resources/styles/en/html.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -25,7 +25,7 @@
<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Modified: trunk/jbpm/docs/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/jbpm/docs/resources/styles/en/html_chunk.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/jbpm/docs/resources/styles/en/html_chunk.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -26,7 +26,7 @@
<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Deleted: trunk/jbpm/docs/resources/support/lib/highlight.jar
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/resources/styles/en/html.xsl
===================================================================
--- trunk/jsf/docs/resources/styles/en/html.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/jsf/docs/resources/styles/en/html.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -25,7 +25,7 @@
<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Modified: trunk/jsf/docs/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/jsf/docs/resources/styles/en/html_chunk.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/jsf/docs/resources/styles/en/html_chunk.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -26,7 +26,7 @@
<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Deleted: trunk/jsf/docs/resources/support/lib/highlight.jar
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/resources/styles/en/html.xsl
===================================================================
--- trunk/seam/docs/resources/styles/en/html.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/seam/docs/resources/styles/en/html.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -25,7 +25,7 @@
<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Modified: trunk/seam/docs/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/seam/docs/resources/styles/en/html_chunk.xsl 2008-02-21 15:32:41 UTC (rev 6504)
+++ trunk/seam/docs/resources/styles/en/html_chunk.xsl 2008-02-21 16:27:34 UTC (rev 6505)
@@ -26,7 +26,7 @@
<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
-<xsl:include href="./highlight.xsl"></xsl:include>
+<xsl:include href="./code-highlight.xsl"></xsl:include>
<!--###################################################
Deleted: trunk/seam/docs/resources/support/lib/highlight.jar
===================================================================
(Binary files differ)
18 years, 1 month
JBoss Tools SVN: r6504 - trunk/hibernatetools/docs/reference/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-02-21 10:32:41 -0500 (Thu, 21 Feb 2008)
New Revision: 6504
Modified:
trunk/hibernatetools/docs/reference/en/master.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-238 - adding links
Modified: trunk/hibernatetools/docs/reference/en/master.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/master.xml 2008-02-21 15:32:12 UTC (rev 6503)
+++ trunk/hibernatetools/docs/reference/en/master.xml 2008-02-21 15:32:41 UTC (rev 6504)
@@ -14,38 +14,24 @@
<subtitle>Reference Guide</subtitle>
- <releaseinfo>
-<para>Version: 3.2.0.GA</para>
-</releaseinfo>
-
-
+ <releaseinfo>
+ <para>Version: 3.2.0.GA</para>
+ </releaseinfo>
+
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/hibernate_logo_a.png" format="PNG" />
+ <imagedata fileref="images/hibernate_logo_a.png" format="PNG"/>
</imageobject>
</mediaobject>
</bookinfo>
-
- <toc></toc>
-
+ <toc/>
<preface>
<title>Preface</title>
- <para>Hibernate Tools is a toolset for Hibernate 3 and related projects.
- The tools provide Ant tasks and Eclipse plugins for performing reverse
- engineering, code generation, visualization and interaction with
- Hibernate.</para>
- </preface>
-
- &setup;
-
- &codegenarchitecture;
-
- &plugins;
-
- &ant;
-
- &reveng;
-
- &codegen;
-</book>
\ No newline at end of file
+ <para>Hibernate Tools is a toolset for <ulink url="http://www.hibernate.org/6.html">Hibernate
+ 3</ulink> and <ulink url="http://www.hibernate.org/27.html">related projects</ulink>. The
+ tools provide Ant tasks and Eclipse plugins for performing reverse engineering, code
+ generation, visualization and interaction with Hibernate.</para>
+ </preface> &setup; &codegenarchitecture; &plugins; &ant; &reveng;
+ &codegen; </book>
18 years, 1 month
JBoss Tools SVN: r6503 - trunk/hibernatetools/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-02-21 10:32:12 -0500 (Thu, 21 Feb 2008)
New Revision: 6503
Modified:
trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
trunk/hibernatetools/docs/reference/en/modules/setup.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-238 - adding several link to download sites and docs; mistakes correction;
Modified: trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml 2008-02-21 15:04:33 UTC (rev 6502)
+++ trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml 2008-02-21 15:32:12 UTC (rev 6503)
@@ -26,8 +26,10 @@
</emphasis> files, requires a <emphasis>
<property>hibernate.cfg.xml</property>
</emphasis>. Named core in Eclipse and <emphasis>
- <property><literal><configuration></literal></property></emphasis>
- in ant.</para>
+ <property>
+ <literal><configuration></literal>
+ </property>
+ </emphasis> in ant.</para>
</listitem>
<listitem>
@@ -35,9 +37,11 @@
<property>hbm.xml</property>
</emphasis> and annotated classes, requires a <emphasis>
<property>hibernate.cfg.xml</property>
- </emphasis>. Named annotations in Eclipse and
- <emphasis>
- <property><literal><annotationconfiguration></literal></property></emphasis> in ant.</para>
+ </emphasis>. Named annotations in Eclipse and <emphasis>
+ <property>
+ <literal><annotationconfiguration></literal>
+ </property>
+ </emphasis> in ant.</para>
</listitem>
<listitem>
@@ -45,17 +49,22 @@
<property>hbm.xml</property>
</emphasis> and annotated classes requires that the project has a <emphasis>
<property>META-INF/persistence.xml</property>
- </emphasis> in its classpath. Named JPA in Eclipse and
- <emphasis>
- <property><literal><jpaconfiguration></literal></property></emphasis> in ant.</para>
+ </emphasis> in its classpath. Named JPA in Eclipse and <emphasis>
+ <property>
+ <literal><jpaconfiguration></literal>
+ </property>
+ </emphasis> in ant.</para>
</listitem>
<listitem>
- <para>A JDBC configuration uses <property>Hibernate Tools</property> reverse engineering and reads its
- mappings via JDBC metadata + additional reverse engineering files (reveng.xml).
- Automatically used in Eclipse when doing reverse engineering from JDBC and named
- <emphasis>
- <property><literal><jdbcconfiguration></literal></property></emphasis> in ant.</para>
+ <para>A JDBC configuration uses <property>Hibernate Tools</property> reverse engineering
+ and reads its mappings via JDBC metadata + additional reverse engineering files
+ (reveng.xml). Automatically used in Eclipse when doing reverse engineering from JDBC and
+ named <emphasis>
+ <property>
+ <literal><jdbcconfiguration></literal>
+ </property>
+ </emphasis> in ant.</para>
</listitem>
</itemizedlist>
</para>
@@ -63,26 +72,28 @@
<para>In most projects you will normally use only one of the Core, Annotation or JPA
configuration and possibly the JDBC configuration if you are using the reverse engineering
facilities of <property>Hibernate Tools</property>. </para>
-
- <note><para>No matter which Hibernate
- Configuration type you are using <property>Hibernate Tools</property> supports them.</para></note>
+ <note>
+ <para>No matter which Hibernate Configuration type you are using <property>Hibernate
+ Tools</property> supports them.</para>
+ </note>
+
<para>The following drawing illustrates the core concepts:</para>
<para>
<figure>
<title>Hibernate Core Concepts</title>
- <mediaobject>
- <imageobject role="fo">
- <imagedata fileref="images/architecture.png" format="PNG"/>
- </imageobject>
+ <mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/architecture.png" format="PNG"/>
+ </imageobject>
- <imageobject role="html">
-
- <imagedata align="center" fileref="images/architecture.png" format="PNG"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <imageobject role="html">
+
+ <imagedata align="center" fileref="images/architecture.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</para>
<para>The code generation is done based on the Configuration model no matter which type of
@@ -98,7 +109,8 @@
the job of the exporter to generate a set of code artifacts.</para>
<para>The tools provides a default set of Exporter's which can be used in both Ant and the
- Eclipse UI. Documentation for these Exporters is in the Ant and Eclipse sections.</para>
+ Eclipse UI. Documentation for these Exporters is in the <link linkend="ant">Ant Tools</link>
+ and <link linkend="plugins">Eclipse Plugins</link> chapters.</para>
<para>Users can provide their own customer Exporter's, either by custom classes implementing the
Exporter interface or simply be providing custom templates. This is documented at <xref
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-02-21 15:04:33 UTC (rev 6502)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-02-21 15:32:12 UTC (rev 6503)
@@ -2,11 +2,13 @@
<chapter id="plugins">
<title>Eclipse Plugins</title>
+ <para>This chapter will introduce you to the functionality that <property>Hibernate
+ Tools</property> provide within Eclipse. That is a set of wizards and editors for simplifying
+ the work with <property>Hibernate</property>.</para>
+
<section>
<title>Introduction</title>
- <para/>
-
<para>The following features are available in the <property>Hibernate Tools</property> Eclipse
plugins:</para>
@@ -33,11 +35,14 @@
Tools</property> will add problem markers if your queries are not valid against the console
configuration associated with the project.</para>
- <para>Please note that these tools do not try to hide any functionality of
- <property>Hibernate</property>. The tools make working with <property>Hibernate</property>
- easier, but you are still encouraged/required to read the documentation for Hibernate to fully
- utilize <property>Hibernate Tools</property> and especially <property>Hibernate</property> it
- self.</para>
+ <note>
+ <para>Please note that these tools do not try to hide any functionality of
+ <property>Hibernate</property>. The tools make working with <property>Hibernate</property>
+ easier, but you are still encouraged/required to read the <ulink
+ url="http://www.hibernate.org/5.html">Hibernate Documentation</ulink> to fully utilize
+ <property>Hibernate Tools</property> and especially <property>Hibernate</property> it
+ self.</para>
+ </note>
</section>
<section>
@@ -319,7 +324,6 @@
</mediaobject>
</figure>
- <para>
<table>
<title>Hibernate Console Configuration Classpath</title>
@@ -361,7 +365,7 @@
</entry>
<entry>
- <para>empty</para>
+ <para>Empty</para>
</entry>
</row>
@@ -382,7 +386,6 @@
</tbody>
</tgroup>
</table>
- </para>
<para>
<figure>
@@ -398,7 +401,7 @@
</mediaobject>
</figure>
-
+ <para>Parameters of the Mappings tab in the <property>Hibernate Console Configuration wizard</property> are explained below:</para>
<table>
<title>Hibernate Console Configuration Mappings</title>
@@ -587,7 +590,7 @@
</entry>
<entry>
- <para>Path to a directory into where all output will be written by default. Be aware
+ <para>Path to a directory where all output will be written by default. Be aware
that existing files will be overwritten, so be sure to specify the correct
directory.</para>
</entry>
@@ -599,9 +602,9 @@
</entry>
<entry>
- <para>If enabled the tools will reverse engineer the database available via the
+ <para>If enabled, the tools will reverse engineer the database available via the
connection information in the selected Hibernate Console Configuration and
- generate code based on the database schema. If not enabled the code generation
+ generate code based on the database schema. If not enabled, the code generation
will just be based on the mappings already specified in the Hibernate Console
configuration.</para>
</entry>
@@ -806,7 +809,7 @@
</entry>
<entry>
- <para>Generates set of html pages that documents the database schema and some of the
+ <para>Generates a set of html pages that documents the database schema and some of the
mappings.</para>
</entry>
</row>
@@ -1218,7 +1221,7 @@
<section>
<title>Hibernate Console Perspective</title>
- <para>The <property>Hibernate Console Perspective</property> combines a set of views which allow
+ <para>The <property>Hibernate Console Perspective</property> combines a set of views which allow
you to see the structure of your mapped entities/classes, edit HQL queries, execute the
queries, and see the results. To use this perspective you need to create a <link
linkend="console_conf">Console configuration</link>.</para>
Modified: trunk/hibernatetools/docs/reference/en/modules/setup.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/setup.xml 2008-02-21 15:04:33 UTC (rev 6502)
+++ trunk/hibernatetools/docs/reference/en/modules/setup.xml 2008-02-21 15:32:12 UTC (rev 6503)
@@ -11,9 +11,12 @@
<title>JBoss Tools</title>
<para><property>JBoss Tools 2.x</property> includes <property>Hibernate Tools</property> and
- thus nothing is required besides downloading and installing <property>JBoss Tools</property>.
- If you need to update to a newer version of the <property>Hibernate Tools</property> just
- follow the instructions in the Eclipse IDE section.</para>
+ thus nothing is required besides <ulink url="http://labs.jboss.com/tools/download/index.html"
+ >downloading</ulink> and <ulink
+ url="http://www.redhat.com/developer_studio/guides/GettingStartedGuide/html_si..."
+ >installing JBoss Tools</ulink>. If you need to update to a newer version of the
+ <property>Hibernate Tools</property> just follow the instructions in the Eclipse IDE
+ section.</para>
</section>
<section>
@@ -21,9 +24,10 @@
<para>To install into any <property>Eclipse 3.3.x</property> based Eclipse IDE you can either
download the <property>Hibernate Tools</property> distribution from the <ulink
- url="http://tools.hibernate.org">Hibernate website</ulink> or use the <property>JBoss
- Tools</property> update site (see also <ulink url="http://tools.hibernate.org"
- >http://tools.hibernate.org</ulink> for links to the update site).</para>
+ url="http://www.hibernate.org/6.html">Hibernate website</ulink> or use the <ulink
+ url="http://download.jboss.org/jbosstools/updates/stable/">JBoss Tools Update Site</ulink>
+ (see also <ulink url="http://tools.hibernate.org">http://tools.hibernate.org</ulink> for links
+ to the update site).</para>
<para>If you download the <property>Hibernate Tools</property> distribution you need to place
the <emphasis>
@@ -40,8 +44,8 @@
then check out <ulink url="https://eclipse-tutorial.dev.java.net/"
>https://eclipse-tutorial.dev.java.net/</ulink> and especially <ulink
url="https://eclipse-tutorial.dev.java.net/visual-tutorials/updatemanager.html"
- >https://eclipse-tutorial.dev.java.net/visual-tutorials/updatemanager.html</ulink> which covers
- using the update manager.</para>
+ >https://eclipse-tutorial.dev.java.net/visual-tutorials/updatemanager.html</ulink> which
+ covers using the update manager.</para>
</note>
<section>
@@ -51,13 +55,11 @@
2.x</property> which at this time is the latest stable release from the Eclipse Webtools
project.</para>
- <para>Because the WTP project not always have had proper versioning of
- their plugins there might exist WTP plugins in your existing eclipse
- directory from other Eclipse based projects that are from an earlier
- WTP release but has either the same version number or higher. It is
- thus recommended that if you have issues with WTP provided features to
- try and install the plugins on a clean install of eclipse to ensure there are no version
- collisions.</para>
+ <para>Because the WTP project not always have had proper versioning of their plugins there
+ might exist WTP plugins in your existing eclipse directory from other Eclipse based projects
+ that are from an earlier WTP release but has either the same version number or higher. It is
+ thus recommended that if you have issues with WTP provided features to try and install the
+ plugins on a clean install of eclipse to ensure there are no version collisions.</para>
</section>
</section>
@@ -69,7 +71,9 @@
<property>hibernate-tools.jar</property>
</emphasis> and associated libraries. The libraries are included in the distribution from the
Hibernate website and the Eclipse updatesite. The libraries are located in the eclipse plugins
- directory at /plugins/org.hibernate.eclipse.x.x.x/lib/tools/. These libraries are 100% independent from the eclipse platform. How to use these
- via ant tasks are described in the <link linkend="ant">Ant Tools</link> chapter.</para>
+ directory at <emphasis>
+ <property>/plugins/org.hibernate.eclipse.x.x.x/lib/tools/</property></emphasis>. These libraries are 100%
+ independent from the eclipse platform. How to use these via ant tasks are described in the
+ <link linkend="ant">Ant Tools</link> chapter.</para>
</section>
</chapter>
18 years, 1 month