January 2010 - jbosstools-commits

JBoss Tools SVN: r19647 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh: ui/editor and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-01-05 12:40:38 -0500 (Tue, 05 Jan 2010) New Revision: 19647 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java Log: JBIDE-5558 - standardize on "SCP" server Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.java 2010-01-05 17:26:27 UTC (rev 19646) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.java 2010-01-05 17:40:38 UTC (rev 19647) @@ -22,8 +22,8 @@ public static String HostsLabel; public static String EditorZipDeployments; public static String EditorSetDeployCommandLabel; - public static String SSHDeploymentSectionTitle; - public static String SSHDeploymentDescription; + public static String SCPDeploymentSectionTitle; + public static String SCPDeploymentDescription; public static String EditorSetUserCommandLabel; public static String EditorSetPasswordCommandLabel; static { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.properties 2010-01-05 17:26:27 UTC (rev 19646) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/Messages.properties 2010-01-05 17:40:38 UTC (rev 19647) @@ -7,5 +7,5 @@ EditorSetUserCommandLabel=Set Username EditorSetPasswordCommandLabel=Set Password EditorSetDeployCommandLabel=Set Remote Deployment Folder -SSHDeploymentSectionTitle=SSH Deployment -SSHDeploymentDescription=Description of SSH Deployment (TODO) \ No newline at end of file +SCPDeploymentSectionTitle=SCP Deployment +SCPDeploymentDescription=Deploy your modules via SCP file transfer \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java 2010-01-05 17:26:27 UTC (rev 19646) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java 2010-01-05 17:40:38 UTC (rev 19647) @@ -52,7 +52,7 @@ } public String getTabName() { - return Messages.SSHDeploymentSectionTitle; + return Messages.SCPDeploymentSectionTitle; } public void setDeploymentPage(ModuleDeploymentPage page) { @@ -90,7 +90,7 @@ Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR); - section.setText(Messages.SSHDeploymentSectionTitle); + section.setText(Messages.SCPDeploymentSectionTitle); section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL)); @@ -99,7 +99,7 @@ composite.setLayout(new FormLayout()); Label descriptionLabel = toolkit.createLabel(composite, - Messages.SSHDeploymentDescription); + Messages.SCPDeploymentDescription); FormData descriptionLabelData = new FormData(); descriptionLabelData.left = new FormAttachment(0, 5); descriptionLabelData.top = new FormAttachment(0, 5);

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19646 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-01-05 12:26:27 -0500 (Tue, 05 Jan 2010) New Revision: 19646 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java Log: JBIDE-5544 - fixed it Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-01-05 15:31:37 UTC (rev 19645) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-01-05 17:26:27 UTC (rev 19646) @@ -153,7 +153,7 @@ } protected IStatus[] removeModule(IServer server, String deployRoot, IModule[] module) { - IPath deployPath = getOutputFilePath(); + IPath deployPath = getOutputFilePath(module); final ArrayList<IStatus> status = new ArrayList<IStatus>(); IFileUtilListener listener = new IFileUtilListener() { public void fileCopied(File source, File dest, boolean result,Exception e) {} @@ -177,7 +177,7 @@ protected IStatus[] fullPublish(IServer server, String deployRoot, IModule[] module) { ArrayList<IStatus> results = new ArrayList<IStatus>(); try { - IPath path = getOutputFilePath(); + IPath path = getOutputFilePath(module); // Get rid of the old FileUtil.safeDelete(path.toFile(), null); @@ -189,6 +189,7 @@ IModule[] children = server.getChildModules(module, new NullProgressMonitor()); for( int i = 0; i < children.length; i++ ) results.addAll(Arrays.asList(fullPublish(server, deployRoot, combine(module, children[i])))); + TrueZipUtil.umount(); return (IStatus[]) results.toArray(new IStatus[results.size()]); } catch( CoreException ce) { results.add(generateCoreExceptionStatus(ce)); @@ -197,7 +198,7 @@ } protected IStatus[] publishChanges(IServer server, String deployRoot, IModule[] module) { - IPath path = getOutputFilePath(); + IPath path = getOutputFilePath(module); de.schlichtherle.io.File root = TrueZipUtil.getFile(path, TrueZipUtil.getJarArchiveDetector()); IModuleResourceDelta[] deltas = ((Server)server).getPublishedResourceDelta(module); return publishChanges(server, deltas, root); @@ -281,7 +282,7 @@ return retval; } - public IPath getOutputFilePath() { + public IPath getOutputFilePath(IModule[] module) { return getDeployPath(module, deployRoot); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2010-01-05 15:31:37 UTC (rev 19645) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2010-01-05 17:26:27 UTC (rev 19646) @@ -80,7 +80,7 @@ LocalZippedPublisherUtil localDelegate = new LocalZippedPublisherUtil(); IStatus localCopyStatus = localDelegate.publishModule(server, deployRoot.toOSString(), module, publishType, delta, monitor); - IPath outputFilepath = localDelegate.getOutputFilePath(); + IPath outputFilepath = localDelegate.getOutputFilePath(module); String deployFolder = getRemoteDeployFolder(server); String deployFile = new Path(deployFolder).append(outputFilepath.lastSegment()).toString();

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19645 - in trunk/documentation/whatsnew: bpel and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-01-05 10:31:37 -0500 (Tue, 05 Jan 2010) New Revision: 19645 Added: trunk/documentation/whatsnew/bpel/ trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html trunk/documentation/whatsnew/bpel/images/ trunk/documentation/whatsnew/bpel/images/bpel_editor.png trunk/documentation/whatsnew/bpel/images/bpel_wizard.png Log: Adding BPEL what's new document Added: trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html =================================================================== --- trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html (rev 0) +++ trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html 2010-01-05 15:31:37 UTC (rev 19645) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>BPEL Editor 1.0.0.GA What's New</title> +</head> +<body> +<h1>BPEL Editor 1.0.0.GA What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a></p> +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>General</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemname3" id="itemname3"></a><b>JBoss BPEL Editor</b> + </td> + <td valign="top">The JBoss BPEL Editor project has been added, which means you can now create, edit and deploy BPEL artifacts for the JBoss BPEL Runtime. +<p><img src="images/bpel_editor.png" style=" width : 571px; height : 411px;"/></p> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="right"> + <a name="itemname3" id="itemname3"></a><b>Wizards</b> + </td> + <td valign="top">Added a 'New' Wizard to create a BPEL project in Eclipse. See the JBoss BPEL Editor tools documentation for details. + <p><img src="images/bpel_wizard.png"/></p> + </td> + + </tr> + +</table> + +</body> + +</html> \ No newline at end of file Property changes on: trunk/documentation/whatsnew/bpel/bpel- 1.0.0.GA.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/bpel/images/bpel_editor.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/bpel/images/bpel_editor.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/bpel/images/bpel_wizard.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/bpel/images/bpel_wizard.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19644 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/configuration/editors and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2010-01-05 04:20:25 -0500 (Tue, 05 Jan 2010) New Revision: 19644 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksToolsStartup.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java Log: JBIDE-5561 Fixed it. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2010-01-05 07:33:17 UTC (rev 19643) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2010-01-05 09:20:25 UTC (rev 19644) @@ -44,12 +44,6 @@ </extension> <extension - point="org.eclipse.ui.startup"> - <startup - class="org.jboss.tools.smooks.configuration.editors.SmooksToolsStartup"> - </startup> - </extension> - <extension point="org.eclipse.ui.decorators"> <decorator adaptable="false" Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java 2010-01-05 07:33:17 UTC (rev 19643) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java 2010-01-05 09:20:25 UTC (rev 19644) @@ -39,6 +39,12 @@ public class SmooksResourceChangeListener implements IResourceChangeListener { public static final String SMOOKS_CONTENTTYPE_ID = "org.jboss.tools.smooks.ui.smooks.contentType"; + private IEditorPart currentEditPart = null; + + public SmooksResourceChangeListener(IEditorPart editorPart) { + this.currentEditPart = editorPart; + } + /* * (non-Javadoc) * @@ -59,12 +65,14 @@ } - class ChangePartNameVisitor implements IResourceDeltaVisitor { -// int count = 0; + // int count = 0; public boolean visit(IResourceDelta delta) { + if (delta == null + || !delta.getResource().equals(((IFileEditorInput) currentEditPart.getEditorInput()).getFile())) + return true; IResource res = delta.getResource(); if (res instanceof IFile) { IFile file = (IFile) res; @@ -98,7 +106,7 @@ IPath newPath = res.getFullPath(); String newfileName = newPath.lastSegment(); - if (newfileName.equals(fileName)) { + if (fileName.equals(newfileName)) { return true; } final String newPartName = newfileName; @@ -113,12 +121,15 @@ for (int i = 0; i < editorReferences.length; i++) { IEditorReference iEditorReference = editorReferences[i]; IEditorPart editorPart = iEditorReference.getEditor(false); + if (editorPart != currentEditPart) + continue; + IEditorInput editorInput = editorPart.getEditorInput(); if (editorInput instanceof IFileEditorInput) { IFile relatedFile = ((IFileEditorInput) editorInput).getFile(); if (relatedFile != null && relatedFile.getFullPath().equals(fOldPath)) { if (editorPart instanceof AbstractSmooksFormEditor) { - ((AbstractSmooksFormEditor) editorPart).setPartName(newPartName); +// ((AbstractSmooksFormEditor) editorPart).setPartName(newPartName); break; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksToolsStartup.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksToolsStartup.java 2010-01-05 07:33:17 UTC (rev 19643) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksToolsStartup.java 2010-01-05 09:20:25 UTC (rev 19644) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.ui.IStartup; /** @@ -23,7 +22,7 @@ * @see org.eclipse.ui.IStartup#earlyStartup() */ public void earlyStartup() { - ResourcesPlugin.getWorkspace().addResourceChangeListener(new SmooksResourceChangeListener()); +// ResourcesPlugin.getWorkspace().addResourceChangeListener(new SmooksResourceChangeListener()); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java 2010-01-05 07:33:17 UTC (rev 19643) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksXMLEditor.java 2010-01-05 09:20:25 UTC (rev 19644) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.ui.IEditorInput; import org.eclipse.wst.sse.ui.StructuredTextEditor; /** @@ -18,4 +20,13 @@ */ public class SmooksXMLEditor extends StructuredTextEditor { + /* (non-Javadoc) + * @see org.eclipse.wst.sse.ui.StructuredTextEditor#doSetInput(org.eclipse.ui.IEditorInput) + */ + @Override + public void doSetInput(IEditorInput input) throws CoreException { + // TODO Auto-generated method stub + super.doSetInput(input); + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-01-05 07:33:17 UTC (rev 19643) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-01-05 09:20:25 UTC (rev 19644) @@ -17,9 +17,13 @@ import java.util.Timer; import java.util.TimerTask; -import org.apache.xml.serialize.OutputFormat; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceChangeEvent; +import org.eclipse.core.resources.IResourceChangeListener; +import org.eclipse.core.resources.IResourceDelta; +import org.eclipse.core.resources.IResourceDeltaVisitor; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; @@ -47,7 +51,9 @@ import org.eclipse.jface.text.DocumentEvent; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentListener; +import org.eclipse.jface.text.TextViewer; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorSite; @@ -55,6 +61,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.ide.FileStoreEditorInput; +import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.smooks.configuration.RuntimeDependency; @@ -103,6 +110,10 @@ public class AbstractSmooksFormEditor extends FormEditor implements IEditingDomainProvider, ISmooksModelValidateListener, ISmooksModelProvider { + private IResourceChangeListener resourceChangeListener = null; + + private IDocumentListener xmlDocumentTraker = null; + private Exception initSmooksModelException = null; protected String platformVersion = SmooksConstants.VERSION_1_2; @@ -139,6 +150,8 @@ public AbstractSmooksFormEditor() { super(); + resourceChangeListener = new SmooksResourceTraker(); + xmlDocumentTraker = new SmooksXMLEditorDocumentListener(); initEditingDomain(); } @@ -239,7 +252,7 @@ EObject rootModel = this.getSmooksModel(); fillComments(doc, rootModel); ByteArrayOutputStream stream = new ByteArrayOutputStream(); - + XMLUtils.outDOMNode(doc, stream); return stream; } catch (Throwable t) { @@ -462,49 +475,36 @@ protected StructuredTextEditor createTextEditor() { SmooksXMLEditor xmlEditor = new SmooksXMLEditor() { + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.SmooksXMLEditor# + * doSetInput(org.eclipse.ui.IEditorInput) + */ + @Override + public void doSetInput(IEditorInput input) throws CoreException { + TextViewer viewer = getTextViewer(); + if (viewer != null) { + IDocument document = viewer.getDocument(); + if (document != null) { + document.removeDocumentListener(xmlDocumentTraker); + } + } + super.doSetInput(input); + viewer = getTextViewer(); + if (viewer != null) { + IDocument document = viewer.getDocument(); + if (document != null) { + document.addDocumentListener(xmlDocumentTraker); + } + } + } + public void createPartControl(Composite parent) { super.createPartControl(parent); - getTextViewer().getDocument().addDocumentListener(new IDocumentListener() { + getTextViewer().getDocument().addDocumentListener(xmlDocumentTraker); - protected Timer timer = new Timer(); - protected TimerTask timerTask; - - public void documentAboutToBeChanged(DocumentEvent documentEvent) { - // Ingore - } - - public void documentChanged(final DocumentEvent documentEvent) { - try { - // This is need for the Properties view. - // - // setSelection(StructuredSelection.EMPTY); - - if (timerTask != null) { - timerTask.cancel(); - } - - if (handleEMFModelChange) { - handleEMFModelChange = false; - } else { - timerTask = new TimerTask() { - @Override - public void run() { - getSite().getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - handleDocumentChange(); - } - }); - } - }; - - timer.schedule(timerTask, 1000); - } - } catch (Exception exception) { - SmooksConfigurationActivator.getDefault().log(exception); - } - } - }); - } }; @@ -647,42 +647,36 @@ validator.startValidate(smooksModel.eResource().getContents(), editingDomain); } } catch (IOException e) { - SmooksConfigurationActivator.getDefault().log(e); + SmooksConfigurationActivator.log(e); } finally { monitor.done(); } } - - public void setPartName(String partName){ - super.setPartName(partName); - } - @Override - public void init(IEditorSite site, IEditorInput input) throws PartInitException { - super.init(site, input); + public void setInput(IEditorInput input) { + if (getEditorInput() != null) { + IFile file = ((IFileEditorInput) getEditorInput()).getFile(); + file.getWorkspace().removeResourceChangeListener(resourceChangeListener); + } + + super.setInput(input); + + if (getEditorInput() != null) { + IFile file = ((IFileEditorInput) getEditorInput()).getFile(); + file.getWorkspace().addResourceChangeListener(resourceChangeListener); + setPartName(file.getName()); + } + String filePath = null; - String partName = "smooks editor"; //$NON-NLS-1$ + IFile file = null; - RuntimeMetadata runtimeMetadata = new RuntimeMetadata(); - if (input instanceof FileStoreEditorInput) { - try { - filePath = ((FileStoreEditorInput) input).getURI().toURL().getFile(); - runtimeMetadata.setSmooksConfig(new File(filePath)); - } catch (MalformedURLException e) { - throw new PartInitException(Messages.AbstractSmooksFormEditor_Exception_Transform_URL, e); - } - } if (input instanceof IFileEditorInput) { file = ((IFileEditorInput) input).getFile(); - runtimeMetadata.setSmooksConfig(file); filePath = file.getFullPath().toPortableString(); - partName = file.getName(); } - if (filePath == null) - throw new PartInitException(Messages.AbstractSmooksFormEditor_Exception_Cannot_Get_Input_File); - + editingDomain.getResourceSet().getResources().clear(); // create EMF resource Resource smooksResource = null; if (file != null) { @@ -692,33 +686,63 @@ smooksResource = new SmooksResourceFactoryImpl().createResource(URI.createFileURI(filePath)); } editingDomain.getResourceSet().getResources().add(smooksResource); - setPartName(partName); - // create Smooks validator - validator = new SmooksModelValidator(); - addValidateListener(this); - Exception ex = checkSmooksConfigContents(null); if (ex == null) { - try { - smooksResource.load(Collections.emptyMap()); - smooksModel = smooksResource.getContents().get(0); - } catch (IOException e) { - initSmooksModelException = e; - // throw new PartInitException(e.getMessage()); + if (smooksModel == null) { + try { + smooksResource.load(Collections.emptyMap()); + smooksModel = smooksResource.getContents().get(0); + } catch (IOException e) { + initSmooksModelException = e; + } + } else { + smooksResource.getContents().add(smooksModel); } + } + } - if (smooksModel != null) { - setDiagnosticList(validator.validate(smooksModel.eResource().getContents(), editingDomain)); - // if success to open editor , check if there isn't ext element - // in - // smooks config file - // create new one for it - String version = SmooksUIUtils.judgeSmooksPlatformVersion(smooksModel); - this.setPlatformVersion(version); - judgeInputReader(); + @Override + public void init(IEditorSite site, IEditorInput input) throws PartInitException { + + // create Smooks validator + if (validator == null) { + validator = new SmooksModelValidator(); + addValidateListener(this); + } + + RuntimeMetadata runtimeMetadata = new RuntimeMetadata(); + String filePath = null; + IFile file = null; + if (input instanceof FileStoreEditorInput) { + try { + filePath = ((FileStoreEditorInput) input).getURI().toURL().getFile(); + runtimeMetadata.setSmooksConfig(new File(filePath)); + } catch (MalformedURLException e) { + throw new PartInitException(Messages.AbstractSmooksFormEditor_Exception_Transform_URL, e); } } + if (input instanceof IFileEditorInput) { + file = ((IFileEditorInput) input).getFile(); + runtimeMetadata.setSmooksConfig(file); + filePath = file.getFullPath().toPortableString(); + } + + if (filePath == null) + throw new PartInitException(Messages.AbstractSmooksFormEditor_Exception_Cannot_Get_Input_File); + + super.init(site, input); + + if (smooksModel != null) { + setDiagnosticList(validator.validate(smooksModel.eResource().getContents(), editingDomain)); + // if success to open editor , check if there isn't ext element + // in + // smooks config file + // create new one for it + String version = SmooksUIUtils.judgeSmooksPlatformVersion(smooksModel); + this.setPlatformVersion(version); + judgeInputReader(); + } } private void assertConfigSupported(RuntimeMetadata runtimeMetadata) throws PartInitException { @@ -727,8 +751,7 @@ for (RuntimeDependency dependency : dependencies) { if (!dependency.isSupportedByEditor()) { java.net.URI changeToNS = dependency.getChangeToNS(); - String errorMsg = Messages.AbstractSmooksFormEditor_Error_Unsupported - + dependency.getNamespaceURI() + String errorMsg = Messages.AbstractSmooksFormEditor_Error_Unsupported + dependency.getNamespaceURI() + Messages.AbstractSmooksFormEditor_Error_Unsupported2; if (changeToNS != null) { @@ -910,4 +933,106 @@ // firePropertyChange(PROP_DIRTY); // } } + + public class SmooksXMLEditorDocumentListener implements IDocumentListener { + protected Timer timer = new Timer(); + protected TimerTask timerTask; + + public void documentAboutToBeChanged(DocumentEvent documentEvent) { + // Ingore + } + + public void documentChanged(final DocumentEvent documentEvent) { + try { + // This is need for the Properties view. + // + // setSelection(StructuredSelection.EMPTY); + + if (timerTask != null) { + timerTask.cancel(); + } + + if (handleEMFModelChange) { + handleEMFModelChange = false; + } else { + timerTask = new TimerTask() { + @Override + public void run() { + getSite().getShell().getDisplay().asyncExec(new Runnable() { + public void run() { + handleDocumentChange(); + } + }); + } + }; + + timer.schedule(timerTask, 1000); + } + } catch (Exception exception) { + SmooksConfigurationActivator.log(exception); + } + } + } + + public class SmooksResourceTraker implements IResourceChangeListener, IResourceDeltaVisitor { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.core.resources.IResourceChangeListener#resourceChanged + * (org.eclipse.core.resources.IResourceChangeEvent) + */ + public void resourceChanged(IResourceChangeEvent event) { + IResourceDelta delta = event.getDelta(); + try { + if (delta != null) + delta.accept(this); + } catch (CoreException exception) { + } + } + + public boolean visit(IResourceDelta delta) throws CoreException { + if (delta == null || !delta.getResource().equals(((IFileEditorInput) getEditorInput()).getFile())) + return true; + + if (delta.getKind() == IResourceDelta.REMOVED) { + Display display = getSite().getShell().getDisplay(); + if ((IResourceDelta.MOVED_TO & delta.getFlags()) == 0) { // if + // the + // file + // was + // deleted + // NOTE: The case where an open, unsaved file is deleted is + // being handled by the + // PartListener added to the Workbench in the initialize() + // method. + display.asyncExec(new Runnable() { + public void run() { + // if (!isDirty()) + closeEditor(false); + } + }); + } else { // else if it was moved or renamed + final IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(delta.getMovedToPath()); + display.asyncExec(new Runnable() { + public void run() { + // try { + // ((SmooksXMLEditor) textEditor).doSetInput(new + // FileEditorInput(newFile)); + // } catch (CoreException e) { + // e.printStackTrace(); + // } + setInput(new FileEditorInput(newFile)); + } + }); + } + } + return false; + } + } + + private void closeEditor(boolean forceSave) { + this.close(forceSave); + } }

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19643 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: editor and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2010-01-05 02:33:17 -0500 (Tue, 05 Jan 2010) New Revision: 19643 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java Log: JBIDE-5561 Fixed it. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java 2010-01-04 21:27:33 UTC (rev 19642) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksResourceChangeListener.java 2010-01-05 07:33:17 UTC (rev 19643) @@ -11,26 +11,25 @@ package org.jboss.tools.smooks.configuration.editors; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectNature; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IResourceDeltaVisitor; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.resources.WorkspaceJob; +import org.eclipse.core.resources.IResourceStatus; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.content.IContentDescription; +import org.eclipse.core.runtime.content.IContentType; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.jboss.tools.smooks.configuration.SmooksConstants; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorReference; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.IWorkbenchWindow; +import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; +import org.jboss.tools.smooks.editor.AbstractSmooksFormEditor; /** * @author Dart (dpeng(a)redhat.com) @@ -38,6 +37,7 @@ * Apr 12, 2009 */ public class SmooksResourceChangeListener implements IResourceChangeListener { + public static final String SMOOKS_CONTENTTYPE_ID = "org.jboss.tools.smooks.ui.smooks.contentType"; /* * (non-Javadoc) @@ -50,7 +50,7 @@ try { switch (event.getType()) { case IResourceChangeEvent.POST_CHANGE: - event.getDelta().accept(new DeltaPrinter()); + event.getDelta().accept(new ChangePartNameVisitor()); break; } } catch (Exception e) { @@ -59,110 +59,104 @@ } - private void deleteFile(IPath path) { - final IPath path1 = path; - WorkspaceJob job = new WorkspaceJob("Delete file") { //$NON-NLS-1$ - public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path1); - if (file.exists()) { - file.delete(true, monitor); - } - return Status.OK_STATUS; - } - }; - job.schedule(); - } + class ChangePartNameVisitor implements IResourceDeltaVisitor { - private void newFile(IPath path, IPath newPath) { - final IPath path1 = path; - final IPath newPath1 = newPath; - WorkspaceJob job = new WorkspaceJob("New file and delete old file") { //$NON-NLS-1$ - public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path1); - if (file.exists()) { - IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(newPath1); - if (newFile.exists()) { - if (MessageDialog.openQuestion(new Shell(Display.getDefault()), - "Cover File?", "Do you want to cover " //$NON-NLS-1$ //$NON-NLS-2$ - + newFile.getFullPath())) { //$NON-NLS-1$ - newFile.setContents(file.getContents(), true, true, monitor); - } - } else { - newFile.create(file.getContents(), true, monitor); - } - file.delete(true, monitor); - } - return Status.OK_STATUS; - } +// int count = 0; - }; - job.schedule(); - } - - class DeltaPrinter implements IResourceDeltaVisitor { - - int count = 0; - public boolean visit(IResourceDelta delta) { IResource res = delta.getResource(); - String fileExtension = res.getFileExtension(); - if (!SmooksConstants.SMOOKS_EXTENTION_NAME.equals(fileExtension)) { //$NON-NLS-1$ - return true; - } - int flags = delta.getFlags(); - switch (delta.getKind()) { - case IResourceDelta.ADDED: - if (flags == IResourceDelta.MOVED_FROM) { - IPath path = delta.getMovedFromPath(); - String fileName = ""; //$NON-NLS-1$ - if (path != null) { - fileName = path.lastSegment(); - int dotIndex = fileName.lastIndexOf("."); //$NON-NLS-1$ - if (dotIndex != -1) { - fileExtension = fileName.substring(dotIndex + 1, fileName.length()); - } - if (!SmooksConstants.SMOOKS_EXTENTION_NAME.equals(fileExtension)) { //$NON-NLS-1$ - return true; - } - fileName += SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT; //$NON-NLS-1$ - path = path.removeLastSegments(1); - path = path.append(fileName); + if (res instanceof IFile) { + IFile file = (IFile) res; + IContentDescription contentDescription; + IContentType contentType = null; + try { + contentDescription = file.getContentDescription(); + if (contentDescription == null) { + return true; } + contentType = contentDescription.getContentType(); - IPath newPath = res.getFullPath(); - fileName = newPath.lastSegment(); - fileName += SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT; //$NON-NLS-1$ - newPath = newPath.removeLastSegments(1).append(fileName); - newFile(path, newPath); + } catch (CoreException e) { + if (e.getStatus().getCode() == IResourceStatus.OUT_OF_SYNC_LOCAL) { + // Determine the content type from the file name. + contentType = Platform.getContentTypeManager().findContentTypeFor(file.getName()); + } } - break; - case IResourceDelta.REMOVED: - if (flags == IResourceDelta.MOVED_TO) { - break; + if (contentType == null || !SMOOKS_CONTENTTYPE_ID.equals(contentType.getId())) { + return true; } - IProject project = res.getProject(); - try { - if (project.isOpen()) { - IProjectNature nature = project.getNature(JavaCore.NATURE_ID); - if (nature != null) { - IJavaProject javaProject = JavaCore.create(project); - IPath outPut = javaProject.getOutputLocation(); - IPath removeRes = res.getFullPath(); - if (outPut.isPrefixOf(removeRes)) { - break; - } + int flags = delta.getFlags(); + switch (delta.getKind()) { + case IResourceDelta.ADDED: + if (flags == IResourceDelta.MOVED_FROM) { + IPath path = delta.getMovedFromPath(); + String fileName = ""; //$NON-NLS-1$ + if (path != null) { + fileName = path.lastSegment(); } + + IPath newPath = res.getFullPath(); + String newfileName = newPath.lastSegment(); + if (newfileName.equals(fileName)) { + return true; + } + final String newPartName = newfileName; + final IPath fOldPath = path; + Display.getDefault().syncExec(new Runnable() { + + public void run() { + IWorkbenchWindow window = SmooksConfigurationActivator.getDefault().getWorkbench() + .getActiveWorkbenchWindow(); + if (window != null) { + IEditorReference[] editorReferences = window.getActivePage().getEditorReferences(); + for (int i = 0; i < editorReferences.length; i++) { + IEditorReference iEditorReference = editorReferences[i]; + IEditorPart editorPart = iEditorReference.getEditor(false); + IEditorInput editorInput = editorPart.getEditorInput(); + if (editorInput instanceof IFileEditorInput) { + IFile relatedFile = ((IFileEditorInput) editorInput).getFile(); + if (relatedFile != null && relatedFile.getFullPath().equals(fOldPath)) { + if (editorPart instanceof AbstractSmooksFormEditor) { + ((AbstractSmooksFormEditor) editorPart).setPartName(newPartName); + break; + } + } + } + } + } + } + }); } - } catch (CoreException e) { - e.printStackTrace(); + break; + case IResourceDelta.REMOVED: + // if (flags == IResourceDelta.MOVED_TO) { + // break; + // } + // IProject project = res.getProject(); + // try { + // if (project.isOpen()) { + // IProjectNature nature = + // project.getNature(JavaCore.NATURE_ID); + // if (nature != null) { + // IJavaProject javaProject = JavaCore.create(project); + // IPath outPut = javaProject.getOutputLocation(); + // IPath removeRes = res.getFullPath(); + // if (outPut.isPrefixOf(removeRes)) { + // break; + // } + // } + // } + // } catch (CoreException e) { + // e.printStackTrace(); + // } + // IPath path = res.getFullPath(); + // String fileName = path.lastSegment(); + // fileName += SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT; //$NON-NLS-1$ + // path = path.removeLastSegments(1).append(fileName); + // deleteFile(path); + break; } - IPath path = res.getFullPath(); - String fileName = path.lastSegment(); - fileName += SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT; //$NON-NLS-1$ - path = path.removeLastSegments(1).append(fileName); - deleteFile(path); - break; } return true; // visit the children } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-01-04 21:27:33 UTC (rev 19642) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-01-05 07:33:17 UTC (rev 19643) @@ -652,6 +652,10 @@ monitor.done(); } } + + public void setPartName(String partName){ + super.setPartName(partName); + } @Override public void init(IEditorSite site, IEditorInput input) throws PartInitException { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-01-04 21:27:33 UTC (rev 19642) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-01-05 07:33:17 UTC (rev 19643) @@ -434,7 +434,9 @@ for (Iterator<?> iterator = temp.iterator(); iterator.hasNext();) { TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator.next(); AbstractSmooksGraphicalModel target = treeNodeConnection.getTargetNode(); - String refID = command.getValue().toString(); + Object refValue = command.getValue(); + if(refValue == null) continue; + String refID = refValue.toString(); Object targetModel = AdapterFactoryEditingDomain.unwrap(target.getData()); if (targetModel instanceof EObject) { EStructuralFeature idfeature = SmooksUIUtils.getBeanIDFeature((EObject) targetModel); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java 2010-01-04 21:27:33 UTC (rev 19642) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java 2010-01-05 07:33:17 UTC (rev 19643) @@ -149,8 +149,9 @@ connection.setData(mapping); } if (isMappingValueConnection(connection)) { + JavaBeanGraphModel collectionJavaBean = getCollectionRootBeanModel(connection.getSourceNode()); String mappingString = FreemarkerCSVContentGenerator.generateMappingString(connection.getSourceNode(), - getCollectionRootBeanModel()); + collectionJavaBean); Mapping mapping = builder.addValueMapping(mappingString, node); connection.setData(mapping); } @@ -160,7 +161,49 @@ } } - protected JavaBeanGraphModel getCollectionRootBeanModel() { + protected JavaBeanGraphModel getCollectionRootBeanModel(AbstractSmooksGraphicalModel sourceNode) { + AbstractSmooksGraphicalModel parentNodeBean = sourceNode; + while (parentNodeBean != null && !(parentNodeBean instanceof JavaBeanGraphModel)) { + parentNodeBean = parentNodeBean.getParent(); + } + if (parentNodeBean != null && parentNodeBean instanceof JavaBeanGraphModel) { + // get the bean reference links + List<TreeNodeConnection> connections = parentNodeBean.getTargetConnections(); + for (Iterator<?> iterator = connections.iterator(); iterator.hasNext();) { + TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator.next(); + // check if the node is "collection bean" node , if is not , + // check its parent node. + AbstractSmooksGraphicalModel collectionJavaBean = treeNodeConnection.getSourceNode(); + collectionJavaBean = collectionJavaBean.getParent(); + if (collectionJavaBean instanceof JavaBeanGraphModel) { + Object data = collectionJavaBean.getData(); + data = AdapterFactoryEditingDomain.unwrap(data); + if (data != null && data instanceof EObject) { + if (SmooksUIUtils.isCollectionJavaGraphModel((EObject) data)) { + return (JavaBeanGraphModel) collectionJavaBean; + // check if it was linked with the "many" template node +// List<TreeNodeConnection> collectionLinks = collectionJavaBean.getSourceConnections(); +// for (Iterator<?> iterator2 = collectionLinks.iterator(); iterator2.hasNext();) { +// TreeNodeConnection treeNodeConnection2 = (TreeNodeConnection) iterator2.next(); +// AbstractSmooksGraphicalModel templateNode = treeNodeConnection2.getTargetNode(); +// if(templateNode instanceof FreemarkerTemplateNodeGraphicalModel){ +// Object templateData = ((FreemarkerTemplateNodeGraphicalModel)templateNode).getData(); +// if(templateData instanceof IFreemarkerTemplateModel){ +// if(((IFreemarkerTemplateModel)templateData).isManyOccurs()){ +// return (JavaBeanGraphModel) collectionJavaBean; +// } +// } +// } +// } + + } + } + } + JavaBeanGraphModel result = getCollectionRootBeanModel(collectionJavaBean); + if (result != null) + return result; + } + } return null; } @@ -181,7 +224,7 @@ protected boolean isMappingValueConnection(TreeNodeConnection connection) { AbstractSmooksGraphicalModel sourceNode = connection.getSourceNode(); Object data = sourceNode.getData(); - if(data instanceof ValueType){ + if (data instanceof ValueType) { return true; } return false;

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19642 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2010-01-04 16:27:33 -0500 (Mon, 04 Jan 2010) New Revision: 19642 Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 Log: https://jira.jboss.org/jira/browse/JBDS-1018 Support for EPP 5 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -74,6 +74,8 @@ static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR = "deploy/jboss-portal-ha.sar"; //$NON-NLS-1$ static final String SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL = "deploy/simple-portal"; //$NON-NLS-1$ + + static final String SERVER_DEFAULT_DEPLOY_GATEIN = "deploy/gatein.ear"; //$NON-NLS-1$ static final String TOMCAT_LIB = "lib"; //$NON-NLS-1$ Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -108,6 +108,12 @@ IPath portletXmlPath = ComponentCore.createComponent(project) .getRootFolder().getUnderlyingFolder().getRawLocation().append( new Path(IPortletConstants.CONFIG_PATH)); + IPath directory = portletXmlPath.removeLastSegments(1); + directory.toFile().mkdirs(); + File file = portletXmlPath.toFile(); + if (file != null && file.exists()) { + return; + } StringBuffer buffer = new StringBuffer(); buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$ @@ -138,18 +144,18 @@ buffer.append("</portlet-app>"); //$NON-NLS-1$ buffer.append("\n"); //$NON-NLS-1$ OutputStream outputStream = null; + PrintWriter printWriter = null; try { - IPath directory = portletXmlPath.removeLastSegments(1); - directory.toFile().mkdirs(); - File file = portletXmlPath.toFile(); file.createNewFile(); outputStream = new FileOutputStream(file); - PrintWriter printWriter = new PrintWriter(outputStream); + printWriter = new PrintWriter(outputStream); printWriter.write(buffer.toString()); - printWriter.close(); } catch (Exception e) { log(e); } finally { + if (printWriter != null) { + printWriter.close(); + } if (outputStream != null) { try { outputStream.close(); @@ -157,7 +163,6 @@ } } } - } public static void log(Exception e, String message) { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -79,6 +79,10 @@ IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL)) { return true; } + // GateIn Portal Server + if (exists(configFile, IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN)) { + return true; + } return false; } // Tomcat portletcontainer Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -84,47 +84,27 @@ File location = runtime.getLocation().toFile(); File libDir = getLibDirectory(location); if (libDir != null) { - File[] jars = libDir - .listFiles(new FileFilter() { + File[] jars = libDir.listFiles(new FileFilter() { public boolean accept(File file) { String name = file.getName(); - return (name.startsWith(IPortletConstants.PORTLET_API) && name - .endsWith(IPortletConstants.JAR)); + return (name.startsWith(IPortletConstants.PORTLET_API) && name.endsWith(IPortletConstants.JAR)); } }); - if (jars != null) { for (int i = 0; i < jars.length; i++) { File jarFile = jars[i]; - - IPath entryPath = new Path(jarFile - .toString()); - + IPath entryPath = new Path(jarFile.toString()); IPath sourceAttachementPath = null; IPath sourceAttachementRootPath = null; - - final ClasspathDecorations dec = decorations - .getDecorations( - getDecorationManagerKey(getPath() - .toString()), - entryPath.toString()); - + final ClasspathDecorations dec = decorations.getDecorations(getDecorationManagerKey(getPath().toString()),entryPath.toString()); IClasspathAttribute[] attrs = {}; if (dec != null) { - sourceAttachementPath = dec - .getSourceAttachmentPath(); - sourceAttachementRootPath = dec - .getSourceAttachmentRootPath(); + sourceAttachementPath = dec.getSourceAttachmentPath(); + sourceAttachementRootPath = dec.getSourceAttachmentRootPath(); attrs = dec.getExtraAttributes(); } - IAccessRule[] access = {}; - IClasspathEntry entry = JavaCore - .newLibraryEntry( - entryPath, - sourceAttachementPath, - sourceAttachementRootPath, - access, attrs, false); + IClasspathEntry entry = JavaCore.newLibraryEntry(entryPath,sourceAttachementPath,sourceAttachementRootPath,access, attrs, false); entries.add(entry); } } @@ -177,16 +157,18 @@ if (libDirectory != null) { libDirectory = new File(libDirectory, "lib"); //$NON-NLS-1$ } else { - // Tomcat adds portlet-api.jat automatically - /*File tomcatLib = new File(location, - IPortletConstants.TOMCAT_LIB); - if (tomcatLib != null && tomcatLib.isDirectory()) { - libDirectory = tomcatLib; - }*/ + libDirectory = getDirectory(location, + IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN); + if (libDirectory != null) { + libDirectory = new File(libDirectory, "lib"); //$NON-NLS-1$ + } else { + // Tomcat adds portlet-api.jar automatically + } } } } } + return libDirectory; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -130,7 +130,6 @@ private void copyLibraries(IProgressMonitor monitor, IJavaProject javaProject, IDataModel config) { - // TODO Auto-generated method stub } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -1,6 +1,7 @@ package org.jboss.tools.portlet.core.internal.project.facet; import java.io.File; +import java.io.FileFilter; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; @@ -387,7 +388,7 @@ PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_the_examples_directory); return; } - File richFacesPortletZip = new File(examplesHome,"RichFacesPortlet.war"); //$NON-NLS-1$ + File richFacesPortletZip = getRichFacesExamples(examplesHome); if (!richFacesPortletZip.exists() || !richFacesPortletZip.isFile()) { PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_the_RichFacesPortlet_war_file); return; @@ -442,6 +443,26 @@ } } + private File getRichFacesExamples(File examplesHome) { + File file = new File(examplesHome,"RichFacesPortlet.war"); //$NON-NLS-1$ + if (file.exists() && file.isFile()) { + return file; + } + File[] listFiles = examplesHome.listFiles(new FilenameFilter() { + + public boolean accept(File dir, String name) { + if (name.startsWith("seamPortlet") && name.endsWith(".war")) { //$NON-NLS-1$ //$NON-NLS-2$ + return true; + } + return false; + } + }); + if (listFiles.length > 0) { + return listFiles[0]; + } + return null; + } + private void deleteOldRichFacesApi(IContainer folder) throws CoreException { IResource[] members = folder.members(); for (int i = 0; i < members.length; i++) { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -7,6 +7,7 @@ import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.COPY_JSF_TEMPLATES; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.CONFIGURE_GATEIN_PARAMETERS; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.EDIT_MODE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.HELP_MODE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IF_EXISTS; @@ -39,13 +40,18 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation; +import org.eclipse.jst.j2ee.model.IModelProvider; +import org.eclipse.jst.javaee.web.WebApp; +import org.eclipse.jst.javaee.web.WebAppVersionType; import org.eclipse.ui.dialogs.IOverwriteQuery; import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; @@ -59,7 +65,10 @@ import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; +import org.jboss.tools.portlet.core.IJBossWebUtil; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.JBossWebUtil; +import org.jboss.tools.portlet.core.JBossWebUtil25; import org.jboss.tools.portlet.core.PortletCoreActivator; import org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties; import org.jboss.tools.portlet.ui.Messages; @@ -144,14 +153,17 @@ if (!isJSFPortlet && !isSeamPortlet) { return; } - boolean addJBossApp = model.getBooleanProperty(ADD_JBOSS_APP); - if (addJBossApp) { - updateJBossApp(aModel); + if (addPortlet) { + boolean addJBossApp = model.getBooleanProperty(ADD_JBOSS_APP); + if (addJBossApp) { + updateJBossApp(aModel); + } + boolean addJBossPortlet = model + .getBooleanProperty(ADD_JBOSS_PORTLET); + if (addJBossPortlet) { + updateJBossPortlet(aModel); + } } - boolean addJBossPortlet = model.getBooleanProperty(ADD_JBOSS_PORTLET); - if (addJBossPortlet) { - updateJBossPortlet(aModel); - } boolean copyJSFTemplates = model.getBooleanProperty(COPY_JSF_TEMPLATES); if (copyJSFTemplates) { @@ -161,8 +173,46 @@ PortletUIActivator.log(e); } } + boolean configureGateIn = model.getBooleanProperty(CONFIGURE_GATEIN_PARAMETERS); + if (configureGateIn) { + configureGateInParameters(aModel); + } } + private void configureGateInParameters(IDataModel aModel) { + final IProject project = getTargetProject(); + final IModelProvider provider = PortletCoreActivator + .getModelProvider(project); + IPath modelPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + boolean exists = project.getProjectRelativePath().append(modelPath).toFile().exists(); + if (isWebApp25(provider.getModelObject()) && !exists) { + modelPath = IModelProvider.FORCESAVE; + } + provider.modify(new Runnable() { + public void run() { + IJBossWebUtil util = null; + + if (isWebApp25(provider.getModelObject())) { + util = new JBossWebUtil25(); + } else { + util = new JBossWebUtil(); + } + String name = "org.jboss.portletbridge.WRAP_SCRIPTS"; //$NON-NLS-1$ + String value = "true"; //$NON-NLS-1$ + String description = null; + util.configureContextParam(project, new NullProgressMonitor(), name, value, description); + + } + }, modelPath); + } + + private boolean isWebApp25(final Object webApp) { + if (webApp instanceof WebApp + && ((WebApp) webApp).getVersion() == WebAppVersionType._25_LITERAL) + return true; + return false; + } + private void updateJBossPortlet(IDataModel model) { IProject project = getTargetProject(); IVirtualComponent component = ComponentCore.createComponent(project); Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -58,4 +58,6 @@ static final String IS_SEAM_PORTLET = "NewPortletClassDataModel.IS_SEAM_PORTLET"; //$NON-NLS-1$ static final String COPY_JSF_TEMPLATES = "NewPortletClassDataModel.COPY_JSF_TEMPLATES"; //$NON-NLS-1$ + + static final String CONFIGURE_GATEIN_PARAMETERS = "NewPortletClassDataModel.CONFIGURE_GATEIN_PARAMETERS"; //$NON-NLS-1$ } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -73,6 +73,7 @@ static final String ADD_JBOSS_APP_LABEL = Messages.IPortletUIConstants_Create_JBoss_Application; static final String ADD_JBOSS_PORTLET_LABEL = Messages.IPortletUIConstants_Add_the_jboss_portlet_xml_file; static final String COPY_JSF_TEMPLATES_LABEL = Messages.IPortletUIConstants_Copy_JSF_Templates; + static final String CONFIGURE_GATEIN_PARAMETERS_LABEL = "Configure GateIn parameters"; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -2,10 +2,14 @@ import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME; +import java.io.File; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -16,6 +20,9 @@ import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.server.core.IRuntime; +import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.PortletCoreActivator; import org.osgi.framework.BundleContext; @@ -100,9 +107,69 @@ } } return false; - } + private static IPath getJBossConfigPath(IDataModel model) { + String projectName = model.getStringProperty(PROJECT_NAME); + if(projectName != null && !"".equals(projectName.trim())) { //$NON-NLS-1$ + IProject project = ProjectUtilities.getProject(projectName); + try { + IFacetedProject facetedProject = ProjectFacetsManager.create(project); + if (facetedProject != null) { + org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = facetedProject.getPrimaryRuntime(); + if (facetRuntime == null) { + return null; + } + IRuntime runtime = PortletCoreActivator.getRuntime(facetRuntime); + if (runtime == null) { + return null; + } + IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); + if (jbossRuntime == null) { + return null; + } + IPath jbossLocation = runtime.getLocation(); + IPath configPath = jbossLocation.append(IJBossServerConstants.SERVER).append(jbossRuntime.getJBossConfiguration()); + return configPath; + } + } catch (CoreException e) { + PortletUIActivator.log(e); + } + } + return null; + } + + public static boolean isJBossPortalRuntime(IDataModel model) { + IPath configPath = getJBossConfigPath(model); + if (configPath == null) { + return false; + } + IPath portalPath = configPath.append(IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR); + File portalFile = portalPath.toFile(); + if (portalFile != null && portalFile.exists()) { + return true; + } + portalPath = configPath.append(IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR); + portalFile = portalPath.toFile(); + if (portalFile != null && portalFile.exists()) { + return true; + } + return false; + } + + public static boolean isGateIn(IDataModel model) { + IPath configPath = getJBossConfigPath(model); + if (configPath == null) { + return false; + } + IPath portalPath = configPath.append(IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN); + File portalFile = portalPath.toFile(); + if (portalFile != null && portalFile.exists()) { + return true; + } + return false; + } + private static IProjectFacet getPortletFacet() { try { return ProjectFacetsManager.getProjectFacet(IPortletConstants.PORTLET_FACET_ID); Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -1,81 +1,56 @@ package org.jboss.tools.portlet.ui.internal.wizard; -import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT_PARAM; -import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION; -import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME; - import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE; import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE; import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_APP; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.CONFIGURE_GATEIN_PARAMETERS; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.COPY_JSF_TEMPLATES; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IF_EXISTS; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INITIAL_WINDOW_STATE; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INSTANCE_NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.NAME; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.TITLE; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INSTANCE_NAME; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.WINDOW_NAME; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.JBOSS_APP; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PAGE_NAME; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IF_EXISTS; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_PORTLET; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_APP; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PAGE_REGION; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PARENT_PORTAL; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PORTLET_HEIGHT; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INITIAL_WINDOW_STATE; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.JBOSS_APP; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.COPY_JSF_TEMPLATES; - +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.WINDOW_NAME; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_APP_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_PORTLET_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_PORTLET_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.CONFIGURE_GATEIN_PARAMETERS_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.COPY_JSF_TEMPLATES_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.IF_EXISTS_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.INITIAL_WINDOW_STATE_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.INSTANCE_NAME_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.WINDOW_NAME_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.JBOSS_APP_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PAGE_NAME_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.IF_EXISTS_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PAGE_REGION_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PARENT_PORTAL_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PORTLET_HEIGHT_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.INITIAL_WINDOW_STATE_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.JBOSS_APP_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_APP_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_PORTLET_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.COPY_JSF_TEMPLATES_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_PORTLET_LABEL; - +import static org.jboss.tools.portlet.ui.IPortletUIConstants.WINDOW_NAME_LABEL; + import org.eclipse.core.runtime.IStatus; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection; -import org.eclipse.jst.servlet.ui.internal.wizard.StringArrayTableWizardSectionCallback; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage; import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin; -import org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties; import org.jboss.tools.portlet.ui.IPortletUIConstants; -import org.jboss.tools.portlet.ui.Messages; +import org.jboss.tools.portlet.ui.PortletUIActivator; /** * JBoss Portlet Wizard Setting Page @@ -84,6 +59,16 @@ */ public class AddJBossPortletWizardPage extends DataModelWizardPage { + private Combo ifExistsCombo; + private Text instanceNameText; + private Text pageNameText; + private Text windowNameText; + private Text parentReferenceText; + private Text regionText; + private Text heightText; + private Combo initialWindowStateCombo; + private Button addPortlet; + public AddJBossPortletWizardPage(IDataModel model, String pageName) { super(model, pageName); setDescription(IPortletUIConstants.ADD_JBOSS_PORTLET_WIZARD_PAGE_DESC); @@ -130,7 +115,10 @@ composite.setLayout(new GridLayout(2, false)); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - final Button addPortlet = new Button(composite,SWT.CHECK); + boolean isJBossPortal = PortletUIActivator.isJBossPortalRuntime(model); + model.setBooleanProperty(ADD_PORTLET, isJBossPortal); + + addPortlet = new Button(composite,SWT.CHECK); addPortlet.setText(ADD_PORTLET_LABEL); GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan = 2; @@ -141,7 +129,7 @@ Label ifExistsLabel = new Label(composite, SWT.LEFT); ifExistsLabel.setText(IF_EXISTS_LABEL); ifExistsLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Combo ifExistsCombo = new Combo(composite,SWT.READ_ONLY); + ifExistsCombo = new Combo(composite,SWT.READ_ONLY); ifExistsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); ifExistsCombo.setItems(new String[] {"overwrite","keep"}); //$NON-NLS-1$ //$NON-NLS-2$ synchHelper.synchCombo(ifExistsCombo, IF_EXISTS, null); @@ -150,7 +138,7 @@ Label instanceNameLabel = new Label(composite, SWT.LEFT); instanceNameLabel.setText(INSTANCE_NAME_LABEL); instanceNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text instanceNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); + instanceNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); instanceNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(instanceNameText, INSTANCE_NAME, null); @@ -158,7 +146,7 @@ Label pageNameLabel = new Label(composite, SWT.LEFT); pageNameLabel.setText(PAGE_NAME_LABEL); pageNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text pageNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); + pageNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); pageNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(pageNameText, PAGE_NAME, null); @@ -166,7 +154,7 @@ Label windowNameLabel = new Label(composite, SWT.LEFT); windowNameLabel.setText(WINDOW_NAME_LABEL); windowNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text windowNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); + windowNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); windowNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(windowNameText, WINDOW_NAME, null); @@ -174,7 +162,7 @@ Label parentReferenceLabel = new Label(composite, SWT.LEFT); parentReferenceLabel.setText(PARENT_PORTAL_LABEL); parentReferenceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text parentReferenceText = new Text(composite, SWT.SINGLE | SWT.BORDER); + parentReferenceText = new Text(composite, SWT.SINGLE | SWT.BORDER); parentReferenceText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(parentReferenceText, PARENT_PORTAL, null); @@ -182,7 +170,7 @@ Label regionLabel = new Label(composite, SWT.LEFT); regionLabel.setText(PAGE_REGION_LABEL); regionLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text regionText = new Text(composite, SWT.SINGLE | SWT.BORDER); + regionText = new Text(composite, SWT.SINGLE | SWT.BORDER); regionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(regionText, PAGE_REGION, null); @@ -190,7 +178,7 @@ Label heightLabel = new Label(composite, SWT.LEFT); heightLabel.setText(PORTLET_HEIGHT_LABEL); heightLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text heightText = new Text(composite, SWT.SINGLE | SWT.BORDER); + heightText = new Text(composite, SWT.SINGLE | SWT.BORDER); heightText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(heightText, PORTLET_HEIGHT, null); @@ -198,7 +186,7 @@ Label initialWindowStateLabel = new Label(composite, SWT.LEFT); initialWindowStateLabel.setText(INITIAL_WINDOW_STATE_LABEL); initialWindowStateLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Combo initialWindowStateCombo = new Combo(composite,SWT.READ_ONLY); + initialWindowStateCombo = new Combo(composite,SWT.READ_ONLY); initialWindowStateCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); initialWindowStateCombo.setItems(new String[] {"maximized","minimized","normal"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ synchHelper.synchCombo(initialWindowStateCombo, INITIAL_WINDOW_STATE, null); @@ -206,15 +194,10 @@ addPortlet.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - boolean enable = addPortlet.getSelection(); - ifExistsCombo.setEnabled(enable); - instanceNameText.setEnabled(enable); - windowNameText.setEnabled(enable); - parentReferenceText.setEnabled(enable); - regionText.setEnabled(enable); - heightText.setEnabled(enable); + enableJBossProperties(); } }); + enableJBossProperties(); if (isJSFPortlet() || isSeamPortlet()) { final Button addJBossApp = new Button(composite, SWT.CHECK); @@ -241,6 +224,9 @@ } }); + addJBossApp.setSelection(isJBossPortal); + jbossAppText.setEnabled(addJBossApp.getSelection()); + final Button addJBossPortlet = new Button(composite, SWT.CHECK); addJBossPortlet.setText(ADD_JBOSS_PORTLET_LABEL); gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); @@ -254,6 +240,17 @@ gd.horizontalSpan = 2; copyJSFTemplates.setLayoutData(gd); synchHelper.synchCheckbox(copyJSFTemplates, COPY_JSF_TEMPLATES, null); + + boolean isGateIn = PortletUIActivator.isGateIn(model); + model.setBooleanProperty(CONFIGURE_GATEIN_PARAMETERS, isGateIn); + + final Button configureGateIn = new Button(composite, SWT.CHECK); + configureGateIn.setText(CONFIGURE_GATEIN_PARAMETERS_LABEL); + gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan = 2; + configureGateIn.setLayoutData(gd); + synchHelper.synchCheckbox(configureGateIn, CONFIGURE_GATEIN_PARAMETERS, null); + } } @@ -275,4 +272,16 @@ protected boolean isSeamPortlet() { return model.getBooleanProperty(IS_SEAM_PORTLET); } + + private void enableJBossProperties() { + boolean enable = addPortlet.getSelection(); + ifExistsCombo.setEnabled(enable); + instanceNameText.setEnabled(enable); + windowNameText.setEnabled(enable); + parentReferenceText.setEnabled(enable); + regionText.setEnabled(enable); + heightText.setEnabled(enable); + initialWindowStateCombo.setEnabled(enable); + pageNameText.setEnabled(enable); + } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -139,6 +139,7 @@ propertyNames.add(IS_JSF_PORTLET); propertyNames.add(IS_SEAM_PORTLET); propertyNames.add(COPY_JSF_TEMPLATES); + propertyNames.add(CONFIGURE_GATEIN_PARAMETERS); return propertyNames; } @@ -179,16 +180,19 @@ return Boolean.FALSE; } if (propertyName.equals(COPY_JSF_TEMPLATES)) { + return Boolean.TRUE; + } + if (propertyName.equals(CONFIGURE_GATEIN_PARAMETERS)) { return Boolean.FALSE; } if (propertyName.equals(ADD_PORTLET)) { return Boolean.TRUE; } if (propertyName.equals(ADD_JBOSS_APP)) { - return Boolean.TRUE; + return getBooleanProperty(ADD_PORTLET); } if (propertyName.equals(ADD_JBOSS_PORTLET)) { - return Boolean.TRUE; + return getBooleanProperty(ADD_PORTLET); } if (propertyName.equals(DO_VIEW)) { return Boolean.TRUE; Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml 2010-01-04 21:27:33 UTC (rev 19642) @@ -5,5 +5,15 @@ <prefix>seam-basic</prefix> <artifactId>seam-basic</artifactId> </plugin> + <plugin> + <name>RichFaces portlet archetype</name> + <prefix>richfaces-basic</prefix> + <artifactId>richfaces-basic</artifactId> + </plugin> + <plugin> + <name>JSF Portlet archetype</name> + <prefix>1.2-basic</prefix> + <artifactId>1.2-basic</artifactId> + </plugin> </plugins> </metadata> \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -3b20fa1f906699efe10222b196d81f18 \ No newline at end of file +47c7c499b5d968d5805dacd5c9729151 \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -538bdb181b289e60f87919e0a2eb297e97fdc1df \ No newline at end of file +38dd94ce08563958f571468cb3f0a37c5d61aba4 \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar =================================================================== (Binary files differ) Property changes on: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +b698d7db4ee7e49f23372f55bc1a8311 \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +a474cc9b4ba0d7029da2b038acca54b7fbb1c28e \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1,36 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.portletbridge.archetypes</groupId> + <artifactId>seam-basic</artifactId> + <version>2.0.1.BETA</version> + <packaging>maven-archetype</packaging> + <name>Seam portlet archetype</name> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </extension> + </extensions> + <plugins> + <plugin> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + + <distributionManagement> + <repository> + <id>internal.repo</id> + <name>JBoss Internal Repository</name> + <url>file:///e:/atest</url> + </repository> + </distributionManagement> + +</project> \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +5c0db171183cb1565e98f0fe7543b4ae \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +7f22e8b42eb601705c7900b479bc2971d2e9435b \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml 2010-01-04 21:27:33 UTC (rev 19642) @@ -3,10 +3,11 @@ <artifactId>seam-basic</artifactId> <version>2.0.0.BETA</version> <versioning> - <latest>2.0.0.BETA</latest> + <latest>2.0.1.BETA</latest> <versions> <version>2.0.0.BETA</version> + <version>2.0.1.BETA</version> </versions> - <lastUpdated>20091111151325</lastUpdated> + <lastUpdated>20100104212258</lastUpdated> </versioning> </metadata> \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -72dee3ddb9610e4297a72f7274f53414 \ No newline at end of file +a6069977184d06af35f7d6ddab2ff68f \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -991c2c38f3d70ab1bbfcc6ce7c80bbc92af4d2dc \ No newline at end of file +15e9c88f8f3a47b76e0a2df6eff55c6487ee71b7 \ No newline at end of file

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19641 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-01-04 12:23:33 -0500 (Mon, 04 Jan 2010) New Revision: 19641 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java Log: JBIDE-5576 - NPE in new fileset wizard on servers with no runtime Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java 2010-01-04 16:56:27 UTC (rev 19640) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java 2010-01-04 17:23:33 UTC (rev 19641) @@ -204,8 +204,12 @@ location = IConstants.SERVER + IPath.SEPARATOR + runtime.getJBossConfiguration(); } } - if( location == null ) + if( location == null && iserver.getRuntime() != null) location = iserver.getRuntime().getLocation().toOSString(); + else if( location == null && iserver.getRuntime() == null ) { + // use workspace location as default if no runtime + location = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString(); + } if (location != null) { FilesetDialog d = new FilesetDialog(new Shell(), location, iserver);

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19640 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-01-04 11:56:27 -0500 (Mon, 04 Jan 2010) New Revision: 19640 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java Log: https://jira.jboss.org/jira/browse/JBIDE-5527 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2010-01-04 00:25:08 UTC (rev 19639) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2010-01-04 16:56:27 UTC (rev 19640) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.hibernate.eclipse.launch; import java.util.ArrayList; @@ -45,6 +55,9 @@ import org.hibernate.eclipse.console.utils.DialogSelectionHelper; import org.hibernate.util.StringHelper; +/** + * Add/edit property dialog to configure Hibernate Exporters. + */ public class AddPropertyDialog extends TitleAreaDialog { private final ExporterFactory ef; @@ -93,7 +106,7 @@ Label label = new Label(composite, SWT.NONE); label.setText( HibernateConsoleMessages.AddPropertyDialog_name ); - final Combo combo = new Combo(composite, SWT.BORDER | SWT.LEAD | SWT.DROP_DOWN); + final Combo combo = new Combo(composite, SWT.BORDER | SWT.DROP_DOWN); GridData pgd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL); pgd.horizontalSpan = 2; combo.setLayoutData(pgd); @@ -134,7 +147,7 @@ label = new Label(composite, SWT.NONE); label.setText( HibernateConsoleMessages.AddPropertyDialog_value ); - value = new Text(composite, SWT.BORDER | SWT.LEAD ); + value = new Text(composite, SWT.BORDER); value.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL)); ((Text)value).addModifyListener( modifyListener ); @@ -293,6 +306,7 @@ selected = viewer.getElementAt( 0 ); } viewer.setSelection(new StructuredSelection(selected)); + viewer.getCombo().select(viewer.getCombo().getSelectionIndex()); } }

14 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r19639 - in trunk/jbpm/docs/converter_ref: en-US and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2010-01-03 19:25:08 -0500 (Sun, 03 Jan 2010) New Revision: 19639 Added: trunk/jbpm/docs/converter_ref/en-US/ trunk/jbpm/docs/converter_ref/en-US/Author_Group.xml trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.ent trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.xml trunk/jbpm/docs/converter_ref/en-US/Book_Info.xml trunk/jbpm/docs/converter_ref/en-US/Preface.xml trunk/jbpm/docs/converter_ref/en-US/Revision_History.xml trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml trunk/jbpm/docs/converter_ref/en-US/images/ trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_1.png trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_2.png trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_3.png trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_4.png trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_5.png trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_7.png trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_8.png trunk/jbpm/docs/converter_ref/en-US/images/jbosstools_logo.png trunk/jbpm/docs/converter_ref/en-US/master.xml trunk/jbpm/docs/converter_ref/en-US/master_output.xml trunk/jbpm/docs/converter_ref/en-US/overview.xml trunk/jbpm/docs/converter_ref/publican.cfg Removed: trunk/jbpm/docs/converter_ref/en/ Modified: trunk/jbpm/docs/converter_ref/pom.xml Log: updating the book so that it is able to be built with Maven and Publican Added: trunk/jbpm/docs/converter_ref/en-US/Author_Group.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/Author_Group.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/Author_Group.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<authorgroup><author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author></authorgroup> Added: trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.ent =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.ent (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.ent 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,4 @@ +<!ENTITY PRODUCT "JBoss"> +<!ENTITY BOOKID "BPMN_Convert_User_Guide"> +<!ENTITY YEAR "2009"> +<!ENTITY HOLDER "Red Hat"> Added: trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/BPMN_Convert_User_Guide.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<book> +<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> +<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> +<xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> +<xi:include href="bpmn2jpdl.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> +<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> +<index></index> +</book> Added: trunk/jbpm/docs/converter_ref/en-US/Book_Info.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/Book_Info.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/Book_Info.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<bookinfo><title>BPMN Convert User Guide</title><subtitle>Provides information relating to the BPMN Convert module.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3.0</productnumber><edition>1.0</edition><pubsnumber>0</pubsnumber><abstract><para>The BPMN Convert User Guide explains how to use the BPMN Convert module to translate a BPMN file to a JPDL file.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></bookinfo> Added: trunk/jbpm/docs/converter_ref/en-US/Preface.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/Preface.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/Preface.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<preface><title>Preface</title><xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></xi:fallback></xi:include></preface> Added: trunk/jbpm/docs/converter_ref/en-US/Revision_History.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/Revision_History.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/Revision_History.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<appendix><title>Revision History</title><simpara><revhistory><revision><revnumber>0</revnumber><date>Fri Nov 20 2009</date><author><firstname>Isaac</firstname><surname>Rooskov</surname><email>irooskov(a)redhat.com</email></author><revdescription><simplelist><member>Initial creation of book by publican</member></simplelist></revdescription></revision></revhistory></simpara></appendix> Added: trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/bpmn2jpdl.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<chapter id="bpmn2jpdl" > + <title>Translate a Bpmn file to a JPDL file</title> + <para>In this chapter we provide you with the necessary steps to translate a Bpmn file to a JPDL file.</para> + + <section id="createproject"> + <title>Creating a project</title> + <para>Before creating a Bpmn file, you should have a Project created.</para> + <para>Create a project by + <emphasis><property>New > Project... > General > Project</property></emphasis>. Enter the following information: + </para> + <para>Project Name: test</para> + + <figure> + <title>Creating a Project</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_1.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property>Finish</property> button.</para> + </section> + <section id="createbpmnfile"> + <title>Creating a Bpmn File by STP BPMN Editor</title> + <para>Create a BPMN diagram file by + <emphasis><property>New > Others... > Bpmn Diagram</property></emphasis> + . Enter the following information: + </para> + <para>File Name: test</para> + <figure> + <title>Creating BPMN Diagram</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_2.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property>Finish</property> button.</para> + <para>Open the test.bpmn_diagram file by double-click it.</para> + <para>Draw the Bpmn diagram using STP BPMN editor. If you do not know how to use STP BPMN editor, please visit <ulink url="http://www.eclipse.org/bpmn/">BPMN project page for details</ulink>.</para> + </section> + <section id="bpmntojpdl"> + <title>Exporting a Bpmn File to Jpdl files</title> + <para>A Bpmn file may include more than one pool. Every pool can be mapped to a corresponding Jpdl file.</para> + <itemizedlist> + <listitem> + <para>Select 'test.bpmn' file and right-click it. Open the export wizard by + <emphasis><property>Export... > BPMN Export > BPMN -> JPDL</property></emphasis> + . + </para> + <figure> + <title>BPMN Export</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_3.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property>Next</property> button.</para> + </listitem> + <listitem> + <para>Select the BPMN file that you want to translate. + </para> + <figure> + <title>Choosing a BPMN File</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_4.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property>Next</property> button.</para> + </listitem> + <listitem> + <para>Select the Pools of BPMN that you want to translate. + </para> + <figure> + <title>Choosing BPMN Pools</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_5.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property>Next</property> button.</para> + </listitem> + <listitem> + <para>On the next page, you may get error or warning messages that occurred during the conversion. If there are no messages, this page is skipped. + </para> + <para>Click on the <property>Next</property> button.</para> + </listitem> + <listitem> + <para>Select the target location to save the generated JPDL files. + </para> + <figure> + <title>Target Location</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_7.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <itemizedlist> + <listitem> + <para>If you'd like to overwrite existing resources,check this "Overwrite existing resources" checkbox.</para> + </listitem> + </itemizedlist> + <para>Click on the <property>Finish</property> button.</para> + <para>Then the JPDL files are generated to the target location.</para> + </listitem> + </itemizedlist> + <para>The generated files look like this: </para> + <figure> + <title>The Generated JPDL Files</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_8.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>We hope, this guide helped you to get started with the JBoss BPMN Convert module. Besides, for additional information you are welcome on <ulink + url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para> + </section> + +</chapter> \ No newline at end of file Added: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_1.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_2.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_3.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_4.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_5.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_7.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_8.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/bpmnconvert_bpmn2jpdl_8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/images/jbosstools_logo.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/docs/converter_ref/en-US/images/jbosstools_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/converter_ref/en-US/master.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/master.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/master.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" +"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd" + +[<!ENTITY overview SYSTEM "overview.xml"> +<!ENTITY bpmn2jpdl SYSTEM "bpmn2jpdl.xml"> +]> + +<book> + + <bookinfo> + <title>BPMN Convert User Guide</title> + <corpauthor> + <inlinemediaobject> + <imageobject role="fo"> + <imagedata format="PNG" fileref="images/jbosstools_logo.png" /> + </imageobject> + <imageobject role="html"> + <imagedata/> + </imageobject> + </inlinemediaobject> + </corpauthor> + + <author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author> + <pubdate>October 2008</pubdate> + <copyright> + <year>2008</year> + <year>2009</year> + <holder>JBoss by Red Hat</holder> + </copyright> + <releaseinfo> + Version: 1.1.0.M2 + </releaseinfo> +<abstract> + <title/> + <para> + <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jboss_bpmn_convert_r...">PDF version</ulink> + </para> +</abstract> + + + </bookinfo> + + <toc/> + &overview; + &bpmn2jpdl; +</book> Added: trunk/jbpm/docs/converter_ref/en-US/master_output.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/master_output.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/master_output.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" +"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd" + +[<!ENTITY overview SYSTEM "overview.xml"> +<!ENTITY bpmn2jpdl SYSTEM "bpmn2jpdl.xml"> +]><book xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + + <bookinfo> + <title>BPMN Convert User Guide</title> + <corpauthor diffmk:change="added"> + <inlinemediaobject diffmk:change="added"> + <imageobject diffmk:change="added" role="fo"> + <imagedata diffmk:change="added" fileref="images/jbosstools_logo.png" format="PNG"></imagedata> + </imageobject> + <imageobject diffmk:change="added" role="html"> + <imagedata diffmk:change="added"></imagedata> + </imageobject> + </inlinemediaobject> + </corpauthor> + + <author><firstname>Grid</firstname><surname>Qian</surname><email>fqian(a)redhat.com</email></author> + <pubdate>October 2008</pubdate> + <copyright> + <year>2008</year> + <year>2009</year> + <holder><diffmk:wrapper diffmk:change="changed">JBoss by Red Hat</diffmk:wrapper></holder> + </copyright> + <releaseinfo><diffmk:wrapper diffmk:change="changed"> + Version: 1.1.0.M2 + </diffmk:wrapper></releaseinfo> +<abstract> + <title></title> + <para> + <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jboss_bpmn_convert_r...">PDF version</ulink> + </para> +</abstract> + + + </bookinfo> + + <toc></toc> + +<chapter id="overview" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/jbpm/docs/converter_ref/en/modules/overview.xml"> + <title>BPMN Convert Overview</title> + <para><diffmk:wrapper diffmk:change="changed">This chapter gives you a short overview of JBoss BPMN Convert module.</diffmk:wrapper></para> + <para><diffmk:wrapper diffmk:change="changed">JBoss BPMN Convert module is a tool used for a BPMN file translation.</diffmk:wrapper></para> + <para>As a part of JBoss tools, JBoss BPMN Convert module implements BPMN -> JPDL translation. You can get a basic JPDL file from a BPMN file by using this module.</para> + <para>The BPMN file may be written by hands or with the help of some editors. In this guide, we use STP BPMN editor to draw a BPMN file.</para> + <para>You can download the editor which is included into BPMN Modeler from Eclipse download or update site. On the <ulink url="http://www.eclipse.org/bpmn">Eclipse BPMN project page</ulink><diffmk:wrapper diffmk:change="added"> you can find the necessary links and other related information.</diffmk:wrapper></para> + +<section diffmk:change="added"> + <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Key Features of JBoss BPMN Convert module</diffmk:wrapper></title> + <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">For a start, we propose you to look through the table of main features of JBoss BPMN Convert module:</diffmk:wrapper></para> + + <table diffmk:change="added"> + + <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Key Functionality of JBoss BPMN Convert module</diffmk:wrapper></title> + <tgroup cols="3" diffmk:change="added"> + + <colspec align="left" colnum="1" colwidth="2*" diffmk:change="added"></colspec> + <colspec colnum="2" colwidth="4*" diffmk:change="added"></colspec> + <colspec align="left" colnum="3" colwidth="2*" diffmk:change="added"></colspec> + + <thead diffmk:change="added"> + <row diffmk:change="added"> + <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Feature</diffmk:wrapper></entry> + <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Benefit</diffmk:wrapper></entry> + <entry diffmk:change="added"><diffmk:wrapper diffmk:change="added">Chapter</diffmk:wrapper></entry> + </row> + </thead> + + <tbody diffmk:change="added"> + + <row diffmk:change="added"> + <entry diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">STP BPMN Editor</diffmk:wrapper></para></entry> + <entry diffmk:change="added"><para diffmk:change="added"><diffmk:wrapper diffmk:change="added">JBoss BPMN Convert module contains STP Business Process Modeling Notation (BPMN) Editor which is a tool to express any processes in a graphical form (simple diagrams with a set of some graphical elements). Created BPMN files can then be converted to jPDL.</diffmk:wrapper></para></entry> + <entry diffmk:change="added"> + <link diffmk:change="added" linkend="createbpmnfile"><diffmk:wrapper diffmk:change="added">creating a BPMN file by STP BPMN editor</diffmk:wrapper></link> + </entry> + </row> + + + </tbody> + + </tgroup> + </table> + + + +</section> + + +</chapter> + +<chapter id="bpmn2jpdl" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml"> + <title>Translate a Bpmn file to a JPDL file</title> + <para>In this chapter we provide you with the necessary steps to translate a Bpmn file to a JPDL file.</para> + + <section id="createproject"> + <title>Creating a project</title> + <para>Before creating a Bpmn file, you should have a Project created.</para> + <para>Create a project by + <emphasis><property moreinfo="none">New > Project... > General > Project</property></emphasis>. Enter the following information: + </para> + <para>Project Name: test</para> + + <figure float="0"> + <title>Creating a Project</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_1.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property moreinfo="none">Finish</property> button.</para> + </section> + <section id="createbpmnfile"> + <title>Creating a Bpmn File by STP BPMN Editor</title> + <para>Create a BPMN diagram file by + <emphasis><property moreinfo="none">New > Others... > Bpmn Diagram</property></emphasis> + . Enter the following information: + </para> + <para>File Name: test</para> + <figure float="0"> + <title>Creating BPMN Diagram</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_2.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property moreinfo="none">Finish</property> button.</para> + <para>Open the test.bpmn_diagram file by double-click it.</para> + <para>Draw the Bpmn diagram using STP BPMN editor. If you do not know how to use STP BPMN editor, please visit <ulink url="http://www.eclipse.org/bpmn/">BPMN project page for details</ulink>.</para> + </section> + <section id="bpmntojpdl"> + <title>Exporting a Bpmn File to Jpdl files</title> + <para>A Bpmn file may include more than one pool. Every pool can be mapped to a corresponding Jpdl file.</para> + <itemizedlist> + <listitem> + <para>Select 'test.bpmn' file and right-click it. Open the export wizard by + <emphasis><property moreinfo="none">Export... > BPMN Export > BPMN -> JPDL</property></emphasis> + . + </para> + <figure float="0"> + <title>BPMN Export</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_3.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property moreinfo="none">Next</property> button.</para> + </listitem> + <listitem> + <para>Select the BPMN file that you want to translate. + </para> + <figure float="0"> + <title>Choosing a BPMN File</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_4.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property moreinfo="none">Next</property> button.</para> + </listitem> + <listitem> + <para>Select the Pools of BPMN that you want to translate. + </para> + <figure float="0"> + <title>Choosing BPMN Pools</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_5.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>Click on the <property moreinfo="none">Next</property> button.</para> + </listitem> + <listitem> + <para>On the next page, you may get error or warning messages that occurred during the conversion. If there are no messages, this page is skipped. + </para> + <para>Click on the <property moreinfo="none">Next</property> button.</para> + </listitem> + <listitem> + <para>Select the target location to save the generated JPDL files. + </para> + <figure float="0"> + <title>Target Location</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_7.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <itemizedlist> + <listitem> + <para>If you'd like to overwrite existing resources,check this "Overwrite existing resources" checkbox.</para> + </listitem> + </itemizedlist> + <para>Click on the <property moreinfo="none">Finish</property> button.</para> + <para>Then the JPDL files are generated to the target location.</para> + </listitem> + </itemizedlist> + <para>The generated files look like this: </para> + <figure float="0"> + <title>The Generated JPDL Files</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/bpmnconvert_bpmn2jpdl_8.png"></imagedata> + </imageobject> + </mediaobject> + </figure> + <para>We hope, this guide helped you to get started with the JBoss BPMN Convert module. Besides, for additional information you are welcome on <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para> + </section> + +</chapter> +</book> Added: trunk/jbpm/docs/converter_ref/en-US/overview.xml =================================================================== --- trunk/jbpm/docs/converter_ref/en-US/overview.xml (rev 0) +++ trunk/jbpm/docs/converter_ref/en-US/overview.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<chapter id="overview"> + <title>BPMN Convert Overview</title> + <para>This chapter gives you a short overview of JBoss BPMN Convert module.</para> + <para>JBoss BPMN Convert module is a tool used for a BPMN file translation.</para> + <para>As a part of JBoss tools, JBoss BPMN Convert module implements BPMN -> JPDL translation. You can get a basic JPDL file from a BPMN file by using this module.</para> + <para>The BPMN file may be written by hands or with the help of some editors. In this guide, we use STP BPMN editor to draw a BPMN file.</para> + <para>You can download the editor which is included into BPMN Modeler from Eclipse download or update site. On the <ulink url="http://www.eclipse.org/bpmn">Eclipse BPMN project page</ulink> you can find the necessary links and other related information.</para> + +<section> + <title>Key Features of JBoss BPMN Convert module</title> + <para>For a start, we propose you to look through the table of main features of JBoss BPMN Convert module:</para> + + <table> + + <title>Key Functionality of JBoss BPMN Convert module</title> + <tgroup cols="3"> + + <colspec colnum="1" align="left" colwidth="2*"/> + <colspec colnum="2" colwidth="4*"/> + <colspec colnum="3" align="left" colwidth="2*"/> + + <thead> + <row> + <entry>Feature</entry> + <entry>Benefit</entry> + <entry>Chapter</entry> + </row> + </thead> + + <tbody> + + <row> + <entry><para>STP BPMN Editor</para></entry> + <entry><para>JBoss BPMN Convert module contains STP Business Process Modeling Notation (BPMN) Editor which is a tool to express any processes in a graphical form (simple diagrams with a set of some graphical elements). Created BPMN files can then be converted to jPDL.</para></entry> + <entry> + <link linkend="createbpmnfile">creating a BPMN file by STP BPMN editor</link> + </entry> + </row> + + + </tbody> + + </tgroup> + </table> + + + +</section> + + +</chapter> \ No newline at end of file Modified: trunk/jbpm/docs/converter_ref/pom.xml =================================================================== --- trunk/jbpm/docs/converter_ref/pom.xml 2009-12-31 16:28:30 UTC (rev 19638) +++ trunk/jbpm/docs/converter_ref/pom.xml 2010-01-04 00:25:08 UTC (rev 19639) @@ -83,9 +83,9 @@ <configuration> <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${pom.basedir}/en</sourceDirectory> + <sourceDirectory>${pom.basedir}/en-US</sourceDirectory> <imageResource> - <directory>${pom.basedir}/en</directory> + <directory>${pom.basedir}/en-US</directory> <includes> <include>images/**/*</include> </includes> Added: trunk/jbpm/docs/converter_ref/publican.cfg =================================================================== --- trunk/jbpm/docs/converter_ref/publican.cfg (rev 0) +++ trunk/jbpm/docs/converter_ref/publican.cfg 2010-01-04 00:25:08 UTC (rev 19639) @@ -0,0 +1,7 @@ +# Config::Simple 4.59 +# Fri Nov 20 13:19:45 2009 + +xml_lang: en-US +type: Book +brand: JBoss +

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits January 2010