April 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r14854 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: icons/16 and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2009-04-22 13:37:11 -0400 (Wed, 22 Apr 2009) New Revision: 14854 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_event_listener.gif trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_swimlane.gif trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_timer.gif trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/NoDetailsTreeRootEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java Log: - add contextmenu to detailsview - editparts to show wrapper details in details view Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_event_listener.gif =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_event_listener.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_swimlane.gif =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_swimlane.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_timer.gif =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/new_timer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-22 17:37:11 UTC (rev 14854) @@ -299,6 +299,86 @@ name="Details" restorable="true"> </view> + </extension> + <extension + point="org.eclipse.ui.commands"> + <category + description="jPDL 4 Command Category" + id="org.jboss.tools.flow.jpdl4" + name="jPDL 4"> + </category> + <command + categoryId="org.jboss.tools.flow.jpdl4" + defaultHandler="org.jboss.tools.flow.jpdl4.handler.AddSwimlaneHandler" + id="org.jboss.tools.flow.jpdl4.addSwimlane" + name="Add Swimlane"> + </command> + <command + categoryId="org.jboss.tools.flow.jpdl4" + defaultHandler="org.jboss.tools.flow.jpdl4.handler.AddEventListenerHandler" + id="org.jboss.tools.flow.jpdl4.addEventListenerType" + name="Add Event Listener Type"> + </command> + <command + categoryId="org.jboss.tools.flow.jpdl4" + defaultHandler="org.jboss.tools.flow.jpdl4.handler.AddEventListenerHandler" + id="org.jboss.tools.flow.jpdl4.addEventListener" + name="Add Event Listener"> + </command> + <command + categoryId="org.jboss.tools.flow.jpdl4" + defaultHandler="org.jboss.tools.flow.jpdl4.handler.AddTimerHandler" + id="org.jboss.tools.flow.jpdl4.addTimer" + name="Add Timer"> + </command> + </extension> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + locationURI="popup:org.jboss.tools.flow.jpdl4.details"> + <command + commandId="org.jboss.tools.flow.jpdl4.addSwimlane" + icon="icons/16/new_swimlane.gif" + id="org.jboss.tools.flow.jpdl4.addSwimlane" + style="push"> + <visibleWhen + checkEnabled="true"> + <iterate> + <instanceof + value="org.jboss.tools.flow.jpdl4.editpart.ProcessTreeRootEditPart"> + </instanceof> + </iterate> + </visibleWhen> + </command> + <command + commandId="org.jboss.tools.flow.jpdl4.addEventListener" + icon="icons/16/new_event_listener.gif" + id="org.jboss.tools.flow.jpdl4.addEventListener" + style="push"> + <visibleWhen + checkEnabled="true"> + <iterate> + <instanceof + value="org.jboss.tools.flow.jpdl4.editpart.ProcessTreeRootEditPart"> + </instanceof> + </iterate> + </visibleWhen> + </command> + <command + commandId="org.jboss.tools.flow.jpdl4.addTimer" + icon="icons/16/new_timer.gif" + id="org.jboss.tools.flow.jpdl4.addTimer" + style="push"> + <visibleWhen + checkEnabled="true"> + <iterate> + <instanceof + value="org.jboss.tools.flow.jpdl4.editpart.ProcessTreeRootEditPart"> + </instanceof> + </iterate> + </visibleWhen> + </command> + </menuContribution> </extension> </plugin> Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -143,7 +143,7 @@ public void postProcess(Wrapper wrapper) { if (!(wrapper instanceof FlowWrapper)) return; FlowWrapper flowWrapper = (FlowWrapper)wrapper; - for (NodeWrapper source : flowWrapper.getElements()) { + for (NodeWrapper source : flowWrapper.getNodeWrappers()) { ArrayList<ConnectionWrapper> flows = (ArrayList<ConnectionWrapper>)source.getElement().getMetaData("flows"); if (flows == null) continue; for (ConnectionWrapper connectionWrapper : flows) { @@ -265,7 +265,7 @@ private NodeWrapper getNamedNode(String name, FlowWrapper flowWrapper) { if (name == null) return null; - for (NodeWrapper nodeWrapper : flowWrapper.getElements()) { + for (NodeWrapper nodeWrapper : flowWrapper.getNodeWrappers()) { if (name.equals(nodeWrapper.getName())) return nodeWrapper; } return null; Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -7,7 +7,6 @@ import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.commands.CommandStack; import org.eclipse.gef.palette.PaletteRoot; -import org.eclipse.gef.ui.parts.SelectionSynchronizer; import org.eclipse.gef.ui.parts.TreeViewer; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; @@ -88,7 +87,7 @@ treeViewer.setEditPartFactory(new JpdlTreeEditPartFactory()); getEditDomain().addViewer(treeViewer); // getSelectionSynchronizer().addViewer(treeViewer); - detailsPage = new DetailsPage(treeViewer) ; + detailsPage = new DetailsPage(treeViewer); getSite().getSelectionProvider().addSelectionChangedListener(detailsPage); } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -395,7 +395,7 @@ private void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { if (wrapper instanceof ContainerWrapper) { ContainerWrapper containerWrapper = (ContainerWrapper)wrapper; - List<NodeWrapper> children = containerWrapper.getElements(); + List<NodeWrapper> children = containerWrapper.getNodeWrappers(); for (NodeWrapper nodeWrapper : children) { appendToBuffer(buffer, nodeWrapper, level+1); } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -10,6 +10,7 @@ public JpdlTreeEditPart(Element element) { super(element); + if (element == null) return; Object object = element.getMetaData("propertySource"); if (object != null && object instanceof IPropertySource) { propertySource = (IPropertySource)object; Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -2,17 +2,21 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; -import org.jboss.tools.flow.jpdl4.model.Process; +import org.jboss.tools.flow.common.wrapper.ConnectionWrapper; +import org.jboss.tools.flow.common.wrapper.FlowWrapper; +import org.jboss.tools.flow.common.wrapper.NodeWrapper; public class JpdlTreeEditPartFactory implements EditPartFactory { public EditPart createEditPart(EditPart context, Object model) { - if (model instanceof Process && context == null) return new ProcessTreeRootEditPart((Process)model); + if (model instanceof FlowWrapper && context == null) return new ProcessTreeRootEditPart((FlowWrapper)model); + if (model instanceof NodeWrapper && context == null) return new TaskTreeRootEditPart((NodeWrapper)model); + if (model instanceof ConnectionWrapper && context == null) return new SequenceFlowTreeRootEditPart((ConnectionWrapper)model); if (model instanceof ProcessNodeListTreeEditPart) return (EditPart)model; if (model instanceof SwimlaneListTreeEditPart) return (EditPart)model; if (model instanceof EventListenerContainerListTreeEditPart) return (EditPart)model; if (model instanceof TimerListTreeEditPart) return (EditPart)model; - return null; + return new NoDetailsTreeRootEditPart(); } } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/NoDetailsTreeRootEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/NoDetailsTreeRootEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/NoDetailsTreeRootEditPart.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -0,0 +1,10 @@ +package org.jboss.tools.flow.jpdl4.editpart; + + +public class NoDetailsTreeRootEditPart extends JpdlTreeEditPart { + + public NoDetailsTreeRootEditPart() { + super(null); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/NoDetailsTreeRootEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -18,7 +18,7 @@ public void modelChanged(ModelEvent event) { super.modelChanged(event); - if (event.getChange() == ContainerWrapper.ADD_ELEMENT) { + if (event.getChangeType() == ContainerWrapper.ADD_ELEMENT) { Object changedObject = event.getChangedObject(); if (changedObject != null) { EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(changedObject); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -18,14 +18,15 @@ public void modelChanged(ModelEvent event) { super.modelChanged(event); - if (event.getChange() == Wrapper.ADD_INCOMING_CONNECTION) { - Object object = getViewer().getEditPartRegistry().get(event.getChangedObject()); + if (event.getChangeType() == Wrapper.ADD_ELEMENT && "incomingConnection".equals(event.getChangeDiscriminator())) { + Object object = getViewer().getEditPartRegistry().get(event.getNewValue()); if (object != null && object instanceof SequenceFlowGraphicalEditPart) { getViewer().select((EditPart)object); ((SequenceFlowGraphicalEditPart)object).performDirectEdit(); } - } else if (event.getChange() == Wrapper.ADD_OUTGOING_CONNECTION || - event.getChange() == Wrapper.REMOVE_OUTGOING_CONNECTION) { + } else if ((event.getChangeType() == Wrapper.ADD_ELEMENT || + event.getChangeType() == Wrapper.REMOVE_ELEMENT) && + "outgoingConnection".equals(event.getChangeDiscriminator())) { for (Object connection : getSourceConnections()) { if (connection instanceof AbstractConnectionEditPart) { ((AbstractConnectionEditPart)connection).refresh(); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -5,31 +5,32 @@ import org.jboss.tools.flow.jpdl4.model.Process; +import org.jboss.tools.flow.common.wrapper.FlowWrapper; + public class ProcessTreeRootEditPart extends JpdlTreeEditPart { - List<Object> modelChildren; + public ProcessTreeRootEditPart(FlowWrapper flowWrapper) { + super(flowWrapper); + } - public ProcessTreeRootEditPart(Process process) { - super(process); + private Process getProcess() { + return (Process)((FlowWrapper)getModel()).getElement(); } protected void createEditPolicies() { } - private List<Object> initModelChildren() { + protected List<Object> getModelChildren() { List<Object> result = new ArrayList<Object>(); - result.add(new SwimlaneListTreeEditPart((Process)getModel())); - result.add(new EventListenerContainerListTreeEditPart((Process)getModel())); - result.add(new TimerListTreeEditPart((Process)getModel())); - result.add(new ProcessNodeListTreeEditPart((Process)getModel())); + result.add(new EventListenerContainerListTreeEditPart(null)); +// Process process = getProcess(); +// if (process.get) return result; +// List<Object> result = new ArrayList<Object>(); +// if (modelChildren == null) { +// modelChildren = initModelChildren(); +// } +// return modelChildren; } - protected List<Object> getModelChildren() { - if (modelChildren == null) { - modelChildren = initModelChildren(); - } - return modelChildren; - } - } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -0,0 +1,20 @@ +package org.jboss.tools.flow.jpdl4.editpart; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.flow.common.wrapper.ConnectionWrapper; + +public class SequenceFlowTreeRootEditPart extends JpdlTreeEditPart { + + public SequenceFlowTreeRootEditPart(ConnectionWrapper connectionWrapper) { + super(connectionWrapper); + } + + protected List<Object> getModelChildren() { + List<Object> result = new ArrayList<Object>(); + result.add(new EventListenerContainerListTreeEditPart(null)); + return result; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -0,0 +1,20 @@ +package org.jboss.tools.flow.jpdl4.editpart; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.flow.common.wrapper.NodeWrapper; + +public class TaskTreeRootEditPart extends JpdlTreeEditPart { + + public TaskTreeRootEditPart(NodeWrapper nodeWrapper) { + super(nodeWrapper); + } + + protected List<Object> getModelChildren() { + List<Object> result = new ArrayList<Object>(); + result.add(new EventListenerContainerListTreeEditPart(null)); + return result; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -0,0 +1,21 @@ +package org.jboss.tools.flow.jpdl4.handler; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.IHandler; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.handlers.HandlerUtil; + +public class AddEventListenerHandler extends AbstractHandler implements IHandler { + + public Object execute(ExecutionEvent event) throws ExecutionException { + IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); + MessageDialog.openInformation( + window.getShell(), "MenuEclipseArticle Plug-in", + "Hello, Eclipse world"); + return null; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -0,0 +1,21 @@ +package org.jboss.tools.flow.jpdl4.handler; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.IHandler; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.handlers.HandlerUtil; + +public class AddSwimlaneHandler extends AbstractHandler implements IHandler { + + public Object execute(ExecutionEvent event) throws ExecutionException { + IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); + MessageDialog.openInformation( + window.getShell(), "MenuEclipseArticle Plug-in", + "Hello, Eclipse world"); + return null; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -0,0 +1,21 @@ +package org.jboss.tools.flow.jpdl4.handler; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.IHandler; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.handlers.HandlerUtil; + +public class AddTimerHandler extends AbstractHandler implements IHandler { + + public Object execute(ExecutionEvent event) throws ExecutionException { + IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); + MessageDialog.openInformation( + window.getShell(), "MenuEclipseArticle Plug-in", + "Hello, Eclipse world"); + return null; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -10,7 +10,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.part.Page; -import org.jboss.tools.flow.common.wrapper.Wrapper; public class DetailsPage extends Page implements IDetailsPage, ISelectionChangedListener { @@ -67,9 +66,6 @@ if (object instanceof EditPart) { object = ((EditPart)object).getModel(); } - if (object instanceof Wrapper) { - object = ((Wrapper)object).getElement(); - } if (getViewer() != null) { getViewer().setContents(object); } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-04-22 15:59:35 UTC (rev 14853) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-04-22 17:37:11 UTC (rev 14854) @@ -1,10 +1,15 @@ package org.jboss.tools.flow.jpdl4.view; +import org.eclipse.jface.action.GroupMarker; +import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.part.IPage; @@ -17,7 +22,21 @@ public class DetailsView extends PageBookView implements ISelectionProvider, ISelectionChangedListener { + + private MenuManager menuManager; + + public void createPartControl(Composite parent) { + createContextMenu(); + super.createPartControl(parent); + } + protected void createContextMenu() { + menuManager = new MenuManager(); + menuManager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS)); + getSite().registerContextMenu("org.jboss.tools.flow.jpdl4.details", menuManager, getSelectionProvider()); + } + + public void addSelectionChangedListener(ISelectionChangedListener listener) { getSelectionProvider().addSelectionChangedListener(listener); } @@ -38,6 +57,8 @@ initPage((IPageBookViewPage)page); } page.createControl(getPageBook()); + Menu menu = menuManager.createContextMenu(getPageBook()); + page.getControl().setMenu(menu); return new PageRec(part, page); } return null;

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14853 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2009-04-22 11:59:35 -0400 (Wed, 22 Apr 2009) New Revision: 14853 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-1077 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-22 15:59:03 UTC (rev 14852) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-22 15:59:35 UTC (rev 14853) @@ -12,6 +12,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.StringTokenizer; @@ -72,9 +73,15 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.seam.core.ISeamComponent; +import org.jboss.tools.seam.core.ISeamContextVariable; +import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; import org.jboss.tools.seam.core.ISeamProject; +import org.jboss.tools.seam.core.ISeamTextSourceReference; +import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamProjectsSet; +import org.jboss.tools.seam.internal.core.BijectedAttribute; +import org.jboss.tools.seam.internal.core.SeamComponentDeclaration; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -100,6 +107,7 @@ private IFile file=null; private ISeamComponent component; private String newName; + private ISeamProject seamProject; /** * @param component Renamed component @@ -108,7 +116,7 @@ super(); this.file = file; IProject project = file.getProject(); - ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); + seamProject = SeamCorePlugin.getSeamProject(project, true); if (seamProject != null) { Set<ISeamComponent> components = seamProject.getComponentsByPath(file.getFullPath()); if (components.size() > 0) { @@ -152,8 +160,8 @@ for(IType type : unit.getAllTypes()){ for(IAnnotation annotation : type.getAnnotations()){ for(String annotationName : annotationNames){ - if(EclipseJavaUtil.resolveType(type, annotation.getElementName()).equals(annotationName)) - annotations.add(annotation); + if(EclipseJavaUtil.resolveType(type, annotation.getElementName()).equals(annotationName)) + annotations.add(annotation); } } } @@ -175,9 +183,8 @@ try{ for(IAnnotation annotation : ((IAnnotatable)element).getAnnotations()){ for(String annotationName : annotationNames){ - if(EclipseJavaUtil.resolveType(type, annotation.getElementName()).equals(annotationName)){ + if(EclipseJavaUtil.resolveType(type, annotation.getElementName()).equals(annotationName)) annotations.add(annotation); - } } } }catch(JavaModelException ex){ @@ -215,7 +222,7 @@ } // we need to find references in .java .xml .xhtml .jsp .properties files - private void findReferences(){ + private void findELReferences(){ SeamProjectsSet projectsSet = new SeamProjectsSet(file.getProject()); IProject[] projects = projectsSet.getAllProjects(); @@ -261,7 +268,7 @@ } if(ext.equalsIgnoreCase(JAVA_EXT)){ scanJava(file, content); - lookingForAnnotations(file); + //lookingForAnnotations(file); } else if(ext.equalsIgnoreCase(XML_EXT) || ext.equalsIgnoreCase(XHTML_EXT) || ext.equalsIgnoreCase(JSP_EXT)) scanDOM(file, content); else if(ext.equalsIgnoreCase(PROPERTIES_EXT)) @@ -283,7 +290,7 @@ } if(source.indexOf("\""+component.getName()+"\"") >= 0){ - createChange(annotation); + changeAnnotation(annotation); }else if(annotation.getParent().getElementType() == IJavaElement.FIELD){ IField field = (IField)annotation.getParent(); if(memberValueNumber == 0 && field.getElementName().equals(component.getName())){ @@ -298,7 +305,7 @@ // }catch(CoreException ex){ // SeamCorePlugin.getDefault().logError(ex); // } - createChange(annotation); + changeAnnotation(annotation); } }else if(annotation.getParent().getElementType() == IJavaElement.METHOD){ IMethod method = (IMethod)annotation.getParent(); @@ -314,13 +321,52 @@ // }catch(CoreException ex){ // SeamCorePlugin.getDefault().logError(ex); // } - createChange(annotation); + changeAnnotation(annotation); } } } } - private void createChange(IAnnotation annotation){ + private void findDeclarations() throws CoreException{ + if(component.getJavaDeclaration() != null) + renameJavaDeclaration(component.getJavaDeclaration()); + + Set<ISeamXmlComponentDeclaration> xmlDecls = component.getXmlDeclarations(); + Iterator<ISeamXmlComponentDeclaration> iter = xmlDecls.iterator(); + while(iter.hasNext()){ + ISeamXmlComponentDeclaration xmlDecl = iter.next(); + if(xmlDecl != null) + renameXMLDeclaration(xmlDecl); + } + } + + private void renameJavaDeclaration(ISeamJavaComponentDeclaration javaDecl) throws CoreException{ + IFile file = (IFile)javaDecl.getResource(); + if(file != null){ + IAnnotation annotation = getNameAnnotation(file); + if(annotation != null){ + TextFileChange change = getChange(file); + + String annotationText = annotation.getSource().replace(component.getName(), newName); + + TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), annotationText); + change.addEdit(edit); + } + } + } + + private void renameXMLDeclaration(ISeamXmlComponentDeclaration xmlDecl){ + IFile file = (IFile)xmlDecl.getResource(); + if(file != null){ + ISeamTextSourceReference location = ((SeamComponentDeclaration)xmlDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME); + + TextFileChange change = getChange(file); + TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newName); + change.addEdit(edit); + } + } + + private void changeAnnotation(IAnnotation annotation){ try{ String annotationText = annotation.getSource(); //String annotationText = "@In(\""+newName+"\")"; @@ -382,8 +428,8 @@ IDOMModel domModel = (IDOMModel) model; IDOMDocument document = domModel.getDocument(); scanChildNodes(file, document); - if(file.getName().equals(COMPONENTS_FILE)) - scanChildComponent(file, document); + //if(file.getName().equals(COMPONENTS_FILE)) + // scanChildComponent(file, document); } } catch (CoreException e) { SeamCorePlugin.getDefault().logError(e); @@ -580,22 +626,28 @@ OperationCanceledException { rootChange = new CompositeChange("Rename Seam Component"); - if(file != null){ - IAnnotation annotation = getNameAnnotation(file); - if(annotation != null){ - TextFileChange change = getChange(file); - - String annotationText = annotation.getSource().replace(component.getName(), newName); - - TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), annotationText); - change.addEdit(edit); - } - } + findDeclarations(); - findReferences(); + findAnnotations(); + findELReferences(); + + return rootChange; } + + private void findAnnotations(){ + Set<ISeamContextVariable> variables = seamProject.getVariablesByName(component.getName()); + + Iterator<ISeamContextVariable> iter = variables.iterator(); + while(iter.hasNext()){ + ISeamContextVariable var = iter.next(); + System.out.println("var - "+var.getClass()); + if(var instanceof BijectedAttribute){ + System.out.println("Bijected..."); + } + } + } /* * (non-Javadoc)

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14852 - in trunk/seam/plugins/org.jboss.tools.seam.xml: src/org/jboss/tools/seam/xml/components/model and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-04-22 11:59:03 -0400 (Wed, 22 Apr 2009) New Revision: 14852 Added: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamPromptingProvider.java trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3804 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-04-22 15:58:01 UTC (rev 14851) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-04-22 15:59:03 UTC (rev 14852) @@ -53,6 +53,9 @@ <xclass id="org.jboss.tools.seam.xml.components.model.constraint.ListIntELConstraint" class="org.jboss.tools.seam.xml.components.model.constraint.ListIntELConstraint"/> + <xclass id="org.jboss.tools.seam.xml.components.model.SeamPromptingProvider" + class="org.jboss.tools.seam.xml.components.model.SeamPromptingProvider"/> + </extension> <extension point="org.eclipse.wst.xml.core.catalogContributions"> Added: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamPromptingProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamPromptingProvider.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamPromptingProvider.java 2009-04-22 15:59:03 UTC (rev 14852) @@ -0,0 +1,53 @@ +package org.jboss.tools.seam.xml.components.model; + +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; +import org.jboss.tools.seam.xml.components.model.helpers.OpenRuleHelper; + +public class SeamPromptingProvider implements IWebPromptingProvider { + + static Set<String> SUPPORTED_IDS = new HashSet<String>(); + static { + SUPPORTED_IDS.add(JSF_OPEN_ACTION); + } + public boolean isSupporting(String id) { + return id != null && SUPPORTED_IDS.contains(id); + } + + public List<Object> getList(XModel model, String id, String prefix, + Properties properties) { + try { + return getListInternal(model, id, prefix, properties); + } catch (CoreException e) { + if(properties != null) { + String message = e.getMessage(); + if(message==null) { + message = e.getClass().getName(); + } + properties.setProperty(ERROR, message); + } + return EMPTY_LIST; + } + } + + private List<Object> getListInternal(XModel model, String id, String prefix, Properties properties) throws CoreException { + String error = null; + if(JSF_OPEN_ACTION.equals(id)) { + IFile file = (IFile)properties.get(FILE); + String action = prefix; + OpenRuleHelper helper = new OpenRuleHelper(); + error = helper.run(model, file, action); + } + if(error != null) throw new XModelException(error); + return EMPTY_LIST; + } + +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamPromptingProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java 2009-04-22 15:59:03 UTC (rev 14852) @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and 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 + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.xml.components.model.helpers; + +import java.util.*; +import org.eclipse.core.resources.IFile; +//import org.eclipse.osgi.util.NLS; + +import org.jboss.tools.common.meta.action.XAction; +import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.model.*; +import org.jboss.tools.common.model.filesystems.FileSystemsHelper; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.web.project.WebProject; + +//see OpenCaseHelper +public class OpenRuleHelper { + + public String run(XModel model, IFile jsp, String action) { + if(model == null || jsp == null || action == null) return null; + XModelObject jspObject = EclipseResourceUtil.getObjectByResource(jsp); + if(jspObject == null) return null; + WebProject p = WebProject.getInstance(model); + String jspLocation = jsp.getLocation().toString().replace('\\', '/'); + String webRoot = p.getWebRootLocation().replace('\\', '/'); + if(webRoot.endsWith("/")) webRoot = webRoot.substring(0, webRoot.length() - 1); + if(!jspLocation.startsWith(webRoot)) return null; + String viewPath = jspLocation.substring(webRoot.length()); + XModelObject result = findRule(model, viewPath, action); + if(result == null) //return NLS.bind(JSFUIMessages.CANNOT_FIND_MATCHING_RULE_FOR_PATH, viewPath); + return "JSFUIMessages.CANNOT_FIND_MATCHING_RULE_FOR_PATH " + viewPath; + XModelObject object = result; + + XAction xaction = XActionInvoker.getAction("Select", object); + if(xaction != null && xaction.isEnabled(object)) { + XActionInvoker.invoke("Select", object, new Properties()); + } + + return null; + } + + private XModelObject findRule(XModel model, String viewPath, String action) { + XModelObject webinf = FileSystemsHelper.getWebInf(model); + if(webinf == null) return null; + XModelObject pagesXML = webinf.getChildByPath("pages.xml"); + if(pagesXML == null) return null; + XModelObject pagesFolder = pagesXML.getChildByPath("Pages"); + XModelObject[] ps = pagesFolder.getChildren(); + + for (int i = 0; i < ps.length; i++) { + String viewId = ps[i].getAttributeValue("view id"); + if(!isPatternMatches(viewId, viewPath)) continue; + XModelObject[] ns = ps[i].getChildren(); + for (int j = 0; j < ns.length; j++) { + String entity = ns[j].getModelEntity().getName(); + if(!entity.startsWith("SeamPageNavigation")) continue; + if(entity.startsWith("SeamPageNavigationRule")) continue; + XModelObject[] rs = ns[j].getChildren(); + for (int k = 0; k < rs.length; k++) { + String a = rs[k].getAttributeValue("if outcome"); + if(a != null && a.equals(action)) { + //TODO compare match length + return rs[k]; + } + } + } + } + + return null; + } + + public static boolean isPatternMatches(String pattern, String fromViewId) { + if(pattern.length() == 0 || "*".equals(pattern)) return true; + pattern = pattern.toLowerCase().replace('\\', '/'); + fromViewId = fromViewId.toLowerCase().replace('\\', '/'); + if(pattern.indexOf('*') < 0) return pattern.equals(fromViewId); + StringTokenizer st = new StringTokenizer(pattern, "*", true); + boolean f = true; + while(st.hasMoreTokens()) { + String t = st.nextToken(); + if("*".equals(t)) { + f = false; + } else { + int i = fromViewId.indexOf(t); + if(i < 0 || (f && i > 0)) return false; + fromViewId = fromViewId.substring(i); + } + } + return true; + } + +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14851 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-04-22 11:58:01 -0400 (Wed, 22 Apr 2009) New Revision: 14851 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-3804 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2009-04-22 15:57:29 UTC (rev 14850) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFPromptingProvider.java 2009-04-22 15:58:01 UTC (rev 14851) @@ -11,6 +11,7 @@ package org.jboss.tools.jsf.model.pv; import java.util.*; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -34,11 +35,34 @@ import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; public class JSFPromptingProvider implements IWebPromptingProvider { - + static Set<String> SUPPORTED_IDS = new HashSet<String>(); + static { + SUPPORTED_IDS.add(JSF_BUNDLES); + SUPPORTED_IDS.add(JSF_REGISTERED_BUNDLES); + SUPPORTED_IDS.add(JSF_BUNDLE_PROPERTIES); + SUPPORTED_IDS.add(JSF_MANAGED_BEANS); + SUPPORTED_IDS.add(JSF_BEAN_PROPERTIES); + SUPPORTED_IDS.add(JSF_BEAN_METHODS); + SUPPORTED_IDS.add(JSF_BEAN_ADD_PROPERTY); + SUPPORTED_IDS.add(JSF_VIEW_ACTIONS); + SUPPORTED_IDS.add(JSF_BEAN_OPEN); + SUPPORTED_IDS.add(JSF_GET_PATH); + SUPPORTED_IDS.add(JSF_OPEN_ACTION); + SUPPORTED_IDS.add(JSF_OPEN_CONVERTOR); + SUPPORTED_IDS.add(JSF_OPEN_VALIDATOR); + SUPPORTED_IDS.add(JSF_OPEN_RENDER_KIT); + SUPPORTED_IDS.add(JSF_OPEN_CLASS_PROPERTY); + SUPPORTED_IDS.add(JSF_OPEN_TAG_LIBRARY); + SUPPORTED_IDS.add(JSF_OPEN_BUNDLE); + SUPPORTED_IDS.add(JSF_OPEN_KEY); + SUPPORTED_IDS.add(JSF_GET_URL); + SUPPORTED_IDS.add(JSF_CONVERT_URL_TO_PATH); + SUPPORTED_IDS.add(JSF_GET_TAGLIBS); + } public final String PROVIDER_ID = "jsf"; public boolean isSupporting(String id) { - return id != null && id.startsWith(PROVIDER_ID); + return id != null && SUPPORTED_IDS.contains(id); } public List<Object> getList(XModel model, String id, String prefix, Properties properties) {

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14850 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-04-22 11:57:29 -0400 (Wed, 22 Apr 2009) New Revision: 14850 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-3804 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2009-04-22 15:19:00 UTC (rev 14849) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2009-04-22 15:57:29 UTC (rev 14850) @@ -24,7 +24,8 @@ static { String[][] pns = new String[][]{ {"org.jboss.tools.jsf.model.pv.JSFPromptingProvider", "org.jboss.tools.jsf"}, - {"org.jboss.tools.struts.model.pv.StrutsPromptingProvider", "org.jboss.tools.struts"} + {"org.jboss.tools.struts.model.pv.StrutsPromptingProvider", "org.jboss.tools.struts"}, + {"org.jboss.tools.seam.xml.components.model.SeamPromptingProvider", "org.jboss.tools.seam.xml"} }; List<IWebPromptingProvider> l = new ArrayList<IWebPromptingProvider>(); for (int i = 0; i < pns.length; i++) { @@ -52,9 +53,21 @@ } public List<Object> getList(XModel model, String id, String prefix, Properties properties) { + String error = null; for (int i = 0; i < providers.length; i++) { - if(providers[i].isSupporting(id)) return providers[i].getList(model, id, prefix, properties); + if(providers[i].isSupporting(id)) { + List<Object> result = providers[i].getList(model, id, prefix, properties); + String err = properties == null ? null : (String)properties.remove(ERROR); + if(err == null) { + return result; + } else if(error == null) { + error = err; + } + } } + if(properties != null && error != null) { + properties.setProperty(ERROR, error); + } return EMPTY_LIST; }

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14849 - branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2009-04-22 11:19:00 -0400 (Wed, 22 Apr 2009) New Revision: 14849 Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java Log: https://jira.jboss.org/jira/browse/JBIDE-4166 the patch should affect Seam 2.x only Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-04-22 14:15:46 UTC (rev 14848) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-04-22 15:19:00 UTC (rev 14849) @@ -14,15 +14,26 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FilenameFilter; import java.io.IOException; import java.util.HashSet; import java.util.Properties; import java.util.Set; +import java.util.regex.Pattern; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; @@ -198,6 +209,84 @@ } @Override + protected void fillManifests() { + try { + File[] earJars = earContentsFolder.listFiles(new FilenameFilter() { + /* (non-Javadoc) + * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String) + */ + public boolean accept(File dir, String name) { + return name.lastIndexOf(".jar") > 0; //$NON-NLS-1$ + } + }); + String earJarsStrWar = ""; //$NON-NLS-1$ + String earJarsStrEjb = ""; //$NON-NLS-1$ + for (File file : earJars) { + earJarsStrWar += " " + file.getName() + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ + if (isJBossSeamJar(file)) { + jbossSeamPath = file.getAbsolutePath(); + } else { + earJarsStrEjb += " " + file.getName() + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ + } + } + + FilterSetCollection manifestFilterColWar = new FilterSetCollection(projectFilterSet); + FilterSet manifestFilter = new FilterSet(); + manifestFilter.addFilter("earLibs", earJarsStrWar); //$NON-NLS-1$ + manifestFilterColWar.addFilterSet(manifestFilter); + + FilterSetCollection manifestFilterColEjb = new FilterSetCollection(projectFilterSet); + FilterSet manifestFilterEjb = new FilterSet(); + manifestFilterEjb.addFilter("earLibs", earJarsStrEjb); //$NON-NLS-1$ + manifestFilterColEjb.addFilterSet(manifestFilterEjb); + + AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterColWar, true); //$NON-NLS-1$ + AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterColEjb, true); //$NON-NLS-1$ + } catch (IOException e) { + SeamCorePlugin.getPluginLog().logError(e); + } + } + + private boolean isJBossSeamJar(File file) { + String regex = "(jboss-seam){1}(-[0-9][0-9\\.]+){0,1}(.jar){1}"; + return Pattern.matches(regex, file.getName()); + } + + @Override + protected void configureEjbClassPath(IProject ejbProject, IProgressMonitor monitor) throws CoreException { + if (jbossSeamPath != null && jbossSeamPath.trim().length() > 0 + && new File(jbossSeamPath).exists()) { + IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot(); + IJavaProject ejbJavaProject = JavaCore + .create(ejbProject); + if (ejbJavaProject != null) { + if (!ejbJavaProject.isOpen()) { + ejbJavaProject.open(monitor); + } + IClasspathEntry[] cps = ejbJavaProject.getRawClasspath(); + IClasspathEntry[] entries = new IClasspathEntry[cps.length + 1]; + for (int i = 0; i < cps.length; i++) { + entries[i] = cps[i]; + } + IPath path = new Path(jbossSeamPath); + IFile[] files = wsRoot.findFilesForLocation(path); + IFile f = null; + if (files != null && files.length > 0) { + f=files[0]; + } else { + f = wsRoot.getFile(path); + } + if (f.exists()) { + path = f.getFullPath(); + } + entries[cps.length] = JavaCore.newLibraryEntry(path, null, + null); + ejbJavaProject.setRawClasspath(entries, monitor); + } + } + } + + @Override protected void createEjbProject() { super.createEjbProject(); // Copy security.drl to source folder Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-04-22 14:15:46 UTC (rev 14848) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-04-22 15:19:00 UTC (rev 14849) @@ -14,12 +14,10 @@ import java.io.FilenameFilter; import java.io.IOException; import java.util.Collections; -import java.util.regex.Pattern; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -31,9 +29,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jst.common.project.facet.JavaFacetUtils; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -113,7 +108,7 @@ protected File ejbMetaInf; protected File droolsLibFolder; - private String jbossSeamPath; + protected String jbossSeamPath; /** * @param model Seam facet data model @@ -209,6 +204,36 @@ return SeamFacetInstallDelegate.JBOSS_EAR_CONTENT; } + protected void fillManifests() { + try { + File[] earJars = earContentsFolder.listFiles(new FilenameFilter() { + /* (non-Javadoc) + * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String) + */ + public boolean accept(File dir, String name) { + return name.lastIndexOf(".jar") > 0; //$NON-NLS-1$ + } + }); + String earJarsStr = ""; //$NON-NLS-1$ + for (File file : earJars) { + earJarsStr += " " + file.getName() + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ + } + + FilterSetCollection manifestFilterCol = new FilterSetCollection(projectFilterSet); + FilterSet manifestFilter = new FilterSet(); + manifestFilter.addFilter("earLibs", earJarsStr); //$NON-NLS-1$ + manifestFilterCol.addFilterSet(manifestFilter); + AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterCol, true); //$NON-NLS-1$ + AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterCol, true); //$NON-NLS-1$ + } catch (IOException e) { + SeamCorePlugin.getPluginLog().logError(e); + } + } + + protected void configureEjbClassPath(IProject ejbProject, IProgressMonitor monitor) throws CoreException { + // Do nothing special for Seam 1.2 + } + /** * Creates test project for seam web project in case of WAR deployment and test, EAR and EJB projects in case of EAR deployment. * @param monitor @@ -222,41 +247,7 @@ createEjbProject(); createEarProject(); - try { - File[] earJars = earContentsFolder.listFiles(new FilenameFilter() { - /* (non-Javadoc) - * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String) - */ - public boolean accept(File dir, String name) { - return name.lastIndexOf(".jar") > 0; //$NON-NLS-1$ - } - }); - String earJarsStrWar = ""; //$NON-NLS-1$ - String earJarsStrEjb = ""; //$NON-NLS-1$ - for (File file : earJars) { - earJarsStrWar += " " + file.getName() + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ - if (isJBossSeamJar(file)) { - jbossSeamPath = file.getAbsolutePath(); - } else { - earJarsStrEjb += " " + file.getName() + " \n"; //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - FilterSetCollection manifestFilterColWar = new FilterSetCollection(projectFilterSet); - FilterSet manifestFilter = new FilterSet(); - manifestFilter.addFilter("earLibs", earJarsStrWar); //$NON-NLS-1$ - manifestFilterColWar.addFilterSet(manifestFilter); - - FilterSetCollection manifestFilterColEjb = new FilterSetCollection(projectFilterSet); - FilterSet manifestFilterEjb = new FilterSet(); - manifestFilterEjb.addFilter("earLibs", earJarsStrEjb); //$NON-NLS-1$ - manifestFilterColEjb.addFilterSet(manifestFilterEjb); - - AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterColWar, true); //$NON-NLS-1$ - AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterColEjb, true); //$NON-NLS-1$ - } catch (IOException e) { - SeamCorePlugin.getPluginLog().logError(e); - } + fillManifests(); } SeamFacetAbstractInstallDelegate.toggleHibernateOnProject(seamWebProject, consoleName); @@ -284,35 +275,9 @@ ClasspathHelper.addClasspathEntries(ejbProjectToBeImported, pfv); IProject earProjectToBeImported = wsRoot.getProject(earProjectName); ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath + "/" + earProjectName, earProjectName, monitor, false); - if (jbossSeamPath != null && jbossSeamPath.trim().length() > 0 - && new File(jbossSeamPath).exists()) { - IJavaProject ejbJavaProject = JavaCore - .create(ejbProjectToBeImported); - if (ejbJavaProject != null) { - if (!ejbJavaProject.isOpen()) { - ejbJavaProject.open(monitor); - } - IClasspathEntry[] cps = ejbJavaProject.getRawClasspath(); - IClasspathEntry[] entries = new IClasspathEntry[cps.length + 1]; - for (int i = 0; i < cps.length; i++) { - entries[i] = cps[i]; - } - IPath path = new Path(jbossSeamPath); - IFile[] files = wsRoot.findFilesForLocation(path); - IFile f = null; - if (files != null && files.length > 0) { - f=files[0]; - } else { - f = wsRoot.getFile(path); - } - if (f.exists()) { - path = f.getFullPath(); - } - entries[cps.length] = JavaCore.newLibraryEntry(path, null, - null); - ejbJavaProject.setRawClasspath(entries, monitor); - } - } + + configureEjbClassPath(ejbProjectToBeImported, monitor); + WtpUtils.reconfigure(ejbProjectToBeImported,monitor); WtpUtils.reconfigure(earProjectToBeImported, monitor); } @@ -334,11 +299,6 @@ WtpUtils.reconfigure(testProjectToBeImported, monitor); } - private boolean isJBossSeamJar(File file) { - String regex = "(jboss-seam){1}(-[0-9][0-9\\.]+){0,1}(.jar){1}"; - return Pattern.matches(regex, file.getName()); - } - /** * Creates test project for given seam web project. */

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14848 - in trunk/common/plugins/org.jboss.tools.common.model.ui: src/org/jboss/tools/common/model/ui/attribute and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-04-22 10:15:46 -0400 (Wed, 22 Apr 2009) New Revision: 14848 Removed: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerFieldEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TabbedJavaChoicerFieldEditor.java Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-4140 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2009-04-22 09:27:47 UTC (rev 14847) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2009-04-22 14:15:46 UTC (rev 14848) @@ -357,8 +357,6 @@ class="org.jboss.tools.common.model.ui.action.XModelObjectActionInvoker"/> <xclass id="org.jboss.tools.common.model.ui.attribute.editor.CheckBoxEditor" class="org.jboss.tools.common.model.ui.attribute.editor.CheckBoxEditor"/> - <xclass id="org.jboss.tools.common.model.ui.attribute.editor.JavaEclipseChoicerFieldEditor" - class="org.jboss.tools.common.model.ui.attribute.editor.JavaEclipseChoicerFieldEditor"/> <xclass id="org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor" class="org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor"/> <xclass id="org.jboss.tools.common.model.ui.attribute.editor.NoteEditor" Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2009-04-22 09:27:47 UTC (rev 14847) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2009-04-22 14:15:46 UTC (rev 14848) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.model.ui.attribute; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -27,7 +28,6 @@ import org.jboss.tools.common.model.ui.attribute.editor.ExtendedFieldEditor; import org.jboss.tools.common.model.ui.attribute.editor.IFieldEditor; import org.jboss.tools.common.model.ui.attribute.editor.IPropertyEditor; -import org.jboss.tools.common.model.ui.attribute.editor.JavaChoicerEditor; import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkLineFieldEditor; import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditor; import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditorFactory; @@ -291,11 +291,9 @@ fieldEditor = editor.getFieldEditor(composite); } else { StringButtonFieldEditorEx sb; - if (editor instanceof JavaChoicerEditor) { - sb = new JavaHyperlinkLineFieldEditor(settings); - } else { - sb = new StringButtonFieldEditorEx(settings); - } + + sb = new StringButtonFieldEditorEx(settings); + sb.setLabelText(editor.getLabelText()); sb.setPropertyEditor(editor); String changeButtonName = editor.getChangeButtonName(); @@ -338,11 +336,9 @@ fieldEditor = editor.getFieldEditor(composite); } else { StringButtonFieldEditorEx sb = null; - if (editor instanceof JavaChoicerEditor) { - sb = new JavaHyperlinkLineFieldEditor(settings); - } else { - sb = new StringButtonFieldEditorEx(settings); - } + + sb = new StringButtonFieldEditorEx(settings); + sb.setLabelText(editor.getLabelText()); String changeButtonName = editor.getChangeButtonName(); if(changeButtonName != null) { Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerEditor.java 2009-04-22 09:27:47 UTC (rev 14847) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaChoicerEditor.java 2009-04-22 14:15:46 UTC (rev 14848) @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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 - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.model.ui.attribute.editor; - -import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; - -import org.jboss.tools.common.model.ui.widgets.IWidgetSettings; - -@Deprecated -public class JavaChoicerEditor extends ValueEditor { - - protected DialogCellEditorEx cellEditor; - //protected JavaChoicerFieldEditor fieldEditor; - protected TabbedJavaChoicerFieldEditor fieldEditor; - - public JavaChoicerEditor() {} - - public JavaChoicerEditor(IWidgetSettings settings) { - super(settings); - } - - public void dispose() { - super.dispose(); - if (cellEditor!=null) cellEditor.dispose(); - cellEditor = null; - if (fieldEditor!=null) fieldEditor.dispose(); - fieldEditor = null; - } - - public boolean isGreedyEditor() { - return true; - } - - protected CellEditor createCellEditor(Composite parent) { -// cellEditor = new DialogCellEditorEx(parent, SWT.NONE); - cellEditor = new JavaHyperlinkCellEditor(parent, SWT.NONE); - cellEditor.setPropertyEditor(this); - return cellEditor; - } - - protected ExtendedFieldEditor createFieldEditor(Composite parent) { - //fieldEditor = new JavaChoicerFieldEditor(); - fieldEditor = new TabbedJavaChoicerFieldEditor(settings); - //fieldEditor.setLabelText(getLabelText()); - return fieldEditor; - } - - public String getChangeButtonName() { - return JFaceResources.getString("openBrowse"); - } - -} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerEditor.java 2009-04-22 09:27:47 UTC (rev 14847) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerEditor.java 2009-04-22 14:15:46 UTC (rev 14848) @@ -64,9 +64,7 @@ } protected ExtendedFieldEditor createFieldEditor(Composite parent) { - //fieldEditor = new JavaChoicerFieldEditor(); fieldEditor = new JavaHyperlinkLineFieldEditor(settings); - //fieldEditor.setLabelText(getLabelText()); return fieldEditor; } Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerFieldEditor.java 2009-04-22 09:27:47 UTC (rev 14847) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/JavaEclipseChoicerFieldEditor.java 2009-04-22 14:15:46 UTC (rev 14848) @@ -1,268 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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 - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.model.ui.attribute.editor; - -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.lang.reflect.Field; -import java.util.ArrayList; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.Signature; -import org.eclipse.jdt.core.search.IJavaSearchScope; -import org.eclipse.jdt.core.search.SearchEngine; -import org.eclipse.jdt.core.search.TypeNameMatch; -//import org.eclipse.jdt.internal.ui.dialogs.TypeInfoViewer; -//import org.eclipse.jdt.internal.ui.dialogs.TypeSelectionComponent; -import org.eclipse.swt.events.MouseAdapter; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Table; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.ui.IValueChangeListener; -import org.jboss.tools.common.model.ui.IValueProvider; -import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter; -import org.jboss.tools.common.model.ui.widgets.IWidgetSettings; -import org.jboss.tools.common.model.util.EclipseResourceUtil; - -@Deprecated -public class JavaEclipseChoicerFieldEditor extends ExtendedFieldEditor implements IFieldEditor, IPropertyFieldEditor, PropertyChangeListener { - protected IPropertyEditor propertyEditor; - protected IValueChangeListener valueChangeListener; - protected IValueProvider valueProvider; - -// protected TypeSelectionComponent tc; - protected String filter; - protected String javaProjectName; - - public JavaEclipseChoicerFieldEditor() {} - - public JavaEclipseChoicerFieldEditor(IWidgetSettings settings) { - super(settings); - } - - protected void adjustForNumColumns(int numColumns) { - } - - protected void doFillIntoGrid(Composite parent, int numColumns) { - } - - protected void doLoad() { - } - - protected void doLoadDefault() { - } - - protected void doStore() { -// if(tc != null && tc.getSelection() != null && tc.getSelection().length > 0) { -// valueProvider.setValue(tc.getSelection()[0].getFullyQualifiedName()); -// } - } - - public int getNumberOfControls() { - return 1; - } - - public Control[] getControls(Composite parent) { - return new Control[] { getControl(parent) }; - } - - private IJavaSearchScope getScope() { - IJavaElement[] elements = new IJavaElement[0]; - if(javaProjectName != null) { - IPath path = new Path(javaProjectName); - IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path); - IProject proj = res.getProject(); - IJavaProject jproject = JavaCore.create(proj); - IPackageFragmentRoot fCurrRoot = jproject.getPackageFragmentRoot(res); - elements = new IJavaElement[] { fCurrRoot.getJavaProject() }; - } else { - IProject[] ps = ModelPlugin.getWorkspace().getRoot().getProjects(); - ArrayList<IJavaElement> l = new ArrayList<IJavaElement>(); - for (int i = 0; i < ps.length; i++) { - if(EclipseResourceUtil.getJavaProject(ps[i]) != null) l.add(JavaCore.create(ps[i])); - } - elements = l.toArray(new IJavaElement[0]); - } - return SearchEngine.createJavaSearchScope(elements); - } - -// private class TitleLabel implements TypeSelectionComponent.ITitleLabel { -// public void setText(String text) { -// } -// } - - protected Control getControl(Composite parent) { - IJavaSearchScope scope = getScope(); -// String title = EditorMessages.getString("JavaEclipseChoicerFieldEditor.ChooseType.Label"); - String message = EditorMessages.getString("JavaEclipseChoicerFieldEditor.ChooseType.Label"); - if (this.valueProvider!=null) { - filter = (String)this.valueProvider.getValue(); // string fron text field! - } else { - filter = "java.lang.Object"; - } - -// tc = new TypeSelectionComponent(parent, 0, message, false, scope, 0/*IJavaSearchConstants.CLASS + IJavaSearchConstants.INTERFACE*/, Signature.getSimpleName(filter), new TitleLabel(), null); - Composite composite = null; //tc; -// tc.triggerSearch(); - - GridLayout layout = new GridLayout(1, false); - composite.setLayout(layout); - layout.horizontalSpacing = 7; - layout.verticalSpacing = 7; - layout.marginHeight = 10; - layout.marginWidth = 10; - -// tc.addSelectionListener(new SelectionListener() { -// public void widgetDefaultSelected(SelectionEvent e) { -// if(hasFocus(tc)) handle(tc.getSelection()); -// } -// public void widgetSelected(SelectionEvent e) { -// if(hasFocus(tc)) handle(tc.getSelection()); -// } -// }); - - Table table = getTable(); - if(table != null) { - table.addMouseListener(new MouseAdapter() { - public void mouseDoubleClick(MouseEvent e) { - if(getOwnerDialog() != null) { - getOwnerDialog().okPressed(); - } - } - }); - } - return composite; - } - - Table getTable() { -// try { -// Field f = TypeSelectionComponent.class.getDeclaredField("fViewer"); -// if(f == null) return null; -// f.setAccessible(true); -// TypeInfoViewer v = (TypeInfoViewer)f.get(tc); -// return v == null ? null : v.getTable(); -// } catch (NoSuchFieldException ee) { -// -// } catch (IllegalArgumentException e2) { -// -// } catch (IllegalAccessException e3) { -// -// } - return null; - } - - boolean hasFocus(Composite c) { - if(c.isFocusControl()) return true; - Control[] cs = c.getChildren(); - for (int i = 0; i < cs.length; i++) { - if(cs[i].isFocusControl()) return true; - if(cs[i] instanceof Composite) { - if(hasFocus((Composite)cs[i])) return true; - } - } - return false; - } - - private void handle(TypeNameMatch[] selection) { - if(selection == null || selection.length == 0) { - this.valueProvider.removeValueChangeListener(this); - valueChangeListener.valueChange(new PropertyChangeEvent(this, PropertyEditor.VALUE, "", "")); - this.valueProvider.addValueChangeListener(this); - } else { - this.valueProvider.removeValueChangeListener(this); - valueChangeListener.valueChange(new PropertyChangeEvent(this, PropertyEditor.VALUE, "", selection[0].getFullyQualifiedName())); - this.valueProvider.addValueChangeListener(this); - } - } - - private boolean localChange = false; - - //never invoked - void handleSelectionChange(PropertyChangeEvent event) { - if (!localChange) { - this.valueProvider.removeValueChangeListener(this); - valueChangeListener.valueChange(new PropertyChangeEvent(this, PropertyEditor.VALUE, event.getOldValue(), event.getNewValue())); - this.valueProvider.addValueChangeListener(this); - } - } - - public void setEnabled(boolean enabled){ - super.setEnabled(enabled); - } - - // IPropertyFieldEditor - public void setPropertyEditor(IPropertyEditor propertyEditor) { - this.propertyEditor = propertyEditor; - if (propertyEditor!=null) { - valueProvider = (IValueProvider)propertyEditor.getAdapter(IValueProvider.class); - // GET Java Project Name! - if (valueProvider instanceof DefaultValueAdapter) { - if (((DefaultValueAdapter)valueProvider).getModel()!=null) { - XModelObject xmo = ((DefaultValueAdapter)valueProvider).getModel().getByPath("FileSystems"); - if (xmo!=null) { - IProject project = (IProject)xmo.getModel().getProperties().get("project"); - if (project!=null) { - this.javaProjectName = project.getName(); - } - } - } - } - valueProvider.addValueChangeListener(this); - valueChangeListener = (IValueChangeListener)propertyEditor.getAdapter(IValueChangeListener.class); - } - } - - // java.beans.PropertyChangeListener for valueProvider - public void propertyChange(PropertyChangeEvent event) { - /* - localChange = true; - if((IPropertyEditor.VALUE.equals(event.getPropertyName()))&&(event!=null)&&(event.getNewValue() instanceof String)) { - this.filter = (String)event.getNewValue(); - } - if (ts!=null) { - try { - this.ts.setFilter(Signature.getSimpleName(filter)); - } catch (Exception e) { - // eat exception: widget disposed - } - } - localChange = false; - */ - } - - public void cut() { - } - - public void copy() { - } - - public void paste() { - } - - public void delete() { - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TabbedJavaChoicerFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TabbedJavaChoicerFieldEditor.java 2009-04-22 09:27:47 UTC (rev 14847) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/TabbedJavaChoicerFieldEditor.java 2009-04-22 14:15:46 UTC (rev 14848) @@ -1,181 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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 - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.model.ui.attribute.editor; - -import org.jboss.tools.common.core.jdt.FavoritesClassController; -import org.jboss.tools.common.model.ui.IValueProvider; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.TabFolder; -import org.eclipse.swt.widgets.TabItem; - -import org.jboss.tools.common.model.ui.ModelUIPlugin; -import org.jboss.tools.common.model.ui.widgets.IWidgetSettings; - -@Deprecated -public class TabbedJavaChoicerFieldEditor extends ExtendedFieldEditor implements IPropertyFieldEditor { - - private static final String LAST_CHOICER = "TabbedJavaChoicerFieldEditor.LastChoicer"; - private static final int WINDOW_HEIGHT = 400; - - protected IPropertyEditor propertyEditor; - protected TabFolder tabbedPane; - protected int selectedTab = 0; - - protected JavaChoicerFieldEditor classicEditor; - protected JavaEclipseChoicerFieldEditor eclipseEditor; - protected JavaFavoritesFieldEditor favoritesEditor; - - public TabbedJavaChoicerFieldEditor() {} - - public TabbedJavaChoicerFieldEditor(IWidgetSettings settings) { - super(settings); - classicEditor = new JavaChoicerFieldEditor(settings); -// eclipseEditor = new JavaEclipseChoicerFieldEditor(settings); - favoritesEditor = new JavaFavoritesFieldEditor(settings); - } - - public void setOwnerDialog(PropertyEditorDialog dialog) { - classicEditor.setOwnerDialog(dialog); -// eclipseEditor.setOwnerDialog(dialog); - favoritesEditor.setOwnerDialog(dialog); - } - - protected void adjustForNumColumns(int numColumns) { - } - - protected void doFillIntoGrid(Composite parent, int numColumns) { - Control control = createTabbedPane(parent); - GridData gd = new GridData(GridData.FILL_BOTH); - gd.horizontalSpan = numColumns; - control.setLayoutData(gd); - } - - protected void doLoad() { - } - - protected void doLoadDefault() { - } - - protected void doStore() { - } - - public int getNumberOfControls() { - return 1; - } - - protected Composite createTabbedPane(Composite parent) { - GridData gd; - - Composite composite = new Composite(parent, SWT.NONE); - composite.setBackground(new Color(null,128,128,0)); - GridLayout layout = new GridLayout(1, false); - composite.setLayout(layout); - layout.horizontalSpacing = 0; - layout.verticalSpacing = 0; - layout.marginHeight = 0; - layout.marginWidth = 0; - gd = new GridData(GridData.FILL_BOTH); - gd.heightHint = WINDOW_HEIGHT; - composite.setLayoutData(gd); - - tabbedPane = new TabFolder(composite, SWT.NONE); - gd = new GridData(GridData.FILL_BOTH); - gd.heightHint = WINDOW_HEIGHT; - tabbedPane.setLayoutData(gd); - // eclipse -// TabItem eclipseChooser = new TabItem(tabbedPane, SWT.NONE); -// eclipseChooser.setControl(createEclipseChooser(tabbedPane)); -// eclipseChooser.setText(EditorMessages.getString("TabbedJavaChoicerFieldEditor.Tab2.Label")); - // classic - TabItem classicChooser = new TabItem(tabbedPane, SWT.NONE); - classicChooser.setControl(createClassicChooser(tabbedPane)); - classicChooser.setText(EditorMessages.getString("TabbedJavaChoicerFieldEditor.Tab1.Label")); - // favorites - TabItem favoritesChooser = new TabItem(tabbedPane, SWT.NONE); - favoritesChooser.setControl(createFavoritesChooser(tabbedPane)); - favoritesChooser.setText(EditorMessages.getString("TabbedJavaChoicerFieldEditor.Tab3.Label")); - - int lastIndex = ModelUIPlugin.getDefault().getPreferenceStore().getInt(LAST_CHOICER); - if(lastIndex >= 0 && lastIndex < 3) { - selectedTab = lastIndex; - tabbedPane.setSelection(lastIndex); - } - - tabbedPane.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - handleTabbedPaneSelection(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - return composite; - } - - private void handleTabbedPaneSelection() { - selectedTab = tabbedPane.getSelectionIndex(); - tabbedPane.getItem(selectedTab).getControl().setFocus(); - ModelUIPlugin.getDefault().getPreferenceStore().setValue(LAST_CHOICER,selectedTab); - } - - protected Control createClassicChooser(Composite parent) { - return classicEditor.getControls(parent)[0]; - } -// protected Control createEclipseChooser(Composite parent) { -// return eclipseEditor.getControls(parent)[0]; -// } - protected Control createFavoritesChooser(Composite parent) { - return favoritesEditor.getControls(parent)[0]; - } - - //IPropertyFieldEditor - public void setPropertyEditor(IPropertyEditor propertyEditor) { - this.propertyEditor = propertyEditor; - classicEditor.setPropertyEditor(propertyEditor); -// eclipseEditor.setPropertyEditor(propertyEditor); - favoritesEditor.setPropertyEditor(propertyEditor); - } - - public void store() { - super.store(); - //if (selectedTab==1) eclipseEditor.doStore(); // bugfix 8136 && 8155 - IValueProvider valueProvider = (IValueProvider)propertyEditor.getAdapter(IValueProvider.class); - String selectedClass = (String)valueProvider.getValue(); - FavoritesClassController.push(selectedClass); - } - - public void setEnabled(boolean enabled){ - super.setEnabled(enabled); - if (classicEditor!=null) classicEditor.setEnabled(enabled); -// if (eclipseEditor!=null) eclipseEditor.setEnabled(enabled); - if (favoritesEditor!=null) favoritesEditor.setEnabled(enabled); - } - - public void cut() { - } - - public void copy() { - } - - public void paste() { - } - - public void delete() { - } - -}

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14847 - in trunk/ws/tests/org.jboss.tools.ws.core.test: src/org/jboss/tools/ws/core/test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2009-04-22 05:27:47 -0400 (Wed, 22 Apr 2009) New Revision: 14847 Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JBossWSCoreAllTests.java trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JBossWSJavaFirstCommandTest.java Log: JBIDE-4219: fix the unit test failure for jboss ws generate codes command Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath 2009-04-22 08:39:17 UTC (rev 14846) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JavaFirstTestProject/.classpath 2009-04-22 09:27:47 UTC (rev 14847) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JAVA1.5"/> - <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> - <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> - <classpathentry kind="output" path="build/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JBossWSCoreAllTests.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JBossWSCoreAllTests.java 2009-04-22 08:39:17 UTC (rev 14846) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/JBossWSCoreAllTests.java 2009-04-22 09:27:47 UTC (rev 14847) @@ -18,6 +18,7 @@ import org.jboss.tools.ws.core.test.classpath.JBossWSRuntimeManagerTest; import org.jboss.tools.ws.core.test.command.JBossWSJavaFirstCommandTest; import org.jboss.tools.ws.core.test.command.JBossWSClientCommandTest; +import org.jboss.tools.ws.core.test.command.JBossWSTopDownCommandTest; public class JBossWSCoreAllTests extends TestCase { public static final String PLUGIN_ID = "org.jboss.tools.common.test"; @@ -27,7 +28,7 @@ suite.addTestSuite(JBossWSRuntimeManagerTest.class); suite.addTestSuite(JBossWSJavaFirstCommandTest.class); suite.addTestSuite(JBossWSClientCommandTest.class); - + suite.addTestSuite(JBossWSTopDownCommandTest.class); return suite; } } \ No newline at end of file Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JBossWSJavaFirstCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JBossWSJavaFirstCommandTest.java 2009-04-22 08:39:17 UTC (rev 14846) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/JBossWSJavaFirstCommandTest.java 2009-04-22 09:27:47 UTC (rev 14847) @@ -62,7 +62,7 @@ protected static final IWorkspace ws = ResourcesPlugin.getWorkspace(); protected static final IWorkbench wb = PlatformUI.getWorkbench(); - protected static final String JBOSSWS_HOME_DEFAULT = "/home/fugang/jboss-all/jboss-soa-p.4.3.0/jboss-as"; + protected static final String JBOSSWS_HOME_DEFAULT = "D:\\softinstall\\jboss-4.2.3GA\\jboss-4.2.3.GA"; private static final String RuntimeName; private static final boolean isDeployed; @@ -142,7 +142,7 @@ assertFalse(status.getMessage(), Status.ERROR == status.getSeverity()); assertTrue(project.getFile( "src/org/example/www/helloworld/jaxws/SayHello.java").exists()); - assertTrue(project.getFile("WebContent/wsdl/HelloWorldService.wsdl") + assertTrue(project.getFile("wsdl/HelloWorldService.wsdl") .exists()); }

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14846 - in trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test: model and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-04-22 04:39:17 -0400 (Wed, 22 Apr 2009) New Revision: 14846 Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/edi-to-sax-order-mapping.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/sj-testimonial-edi-mapping.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-basic.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-to-xml.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/profiling.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/bindings.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/csv-xml.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/datasources.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/db-extract-transform-load.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-orders-parser.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-java.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-xml.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/file-router.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/freemarker-huge-transform.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/groovy.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/java-to-java.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/json-to-java.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic-virtual.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial-sax.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/splitter-router.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java-virtual.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-basic.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-groovy.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-namespaces.xml trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java Log: JBIDE-4217 1.collect smooks config file for smooks1.1.2 and smooks1.0 2.write a test case to load them. Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/edi-to-sax-order-mapping.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/edi-to-sax-order-mapping.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/edi-to-sax-order-mapping.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<medi:edimap xmlns:medi="http://www.milyn.org/schema/edi-message-mapping-1.0.xsd"> + + <medi:description name="DVD Order" version="1.0"/> + + <medi:delimiters segment="
" field="*" component="^" sub-component="~"/> + + <medi:segments xmltag="orders"> + + <medi:segment segcode="MLS" xmltag="message-header"> + <medi:field xmltag="date"/> + </medi:segment> + + <medi:segment segcode="HDR" xmltag="order" minOccurs="1" maxOccurs="-1"> + <medi:field xmltag="order-id"/> + <medi:field xmltag="status-code"/> + <medi:field xmltag="net-amount"/> + <medi:field xmltag="total-amount"/> + <medi:field xmltag="tax"/> + + <medi:segment segcode="CUS" xmltag="customer-details" minOccurs="1" maxOccurs="1"> + <medi:field xmltag="username"/> + <medi:field xmltag="name"> + <medi:component xmltag="firstname"/> + <medi:component xmltag="lastname"/> + </medi:field> + <medi:field xmltag="state"/> + </medi:segment> + + <medi:segment segcode="ORD" xmltag="order-item" minOccurs="1" maxOccurs="-1"> + <medi:field xmltag="position"/> + <medi:field xmltag="quantity"/> + <medi:field xmltag="productId"/> + <medi:field xmltag="title"/> + <medi:field xmltag="price"/> + </medi:segment> + + </medi:segment> + + </medi:segments> + +</medi:edimap> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/edi-to-sax-order-mapping.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/sj-testimonial-edi-mapping.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/sj-testimonial-edi-mapping.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/sj-testimonial-edi-mapping.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,63 @@ +<medi:edimap xmlns:medi="http://www.milyn.org/schema/edi-message-mapping-1.0.xsd"> + + <medi:description name="rollingstock_edi" version="1.0" /> + + <medi:delimiters segment="
" field="," component="*" sub-component="-"/> + + <medi:segments xmltag="rollingstocks"> + + <medi:segment segcode="Ta" xmltag="rollingstock" minOccurs="0" maxOccurs="-1"> + <medi:field xmltag="departureDate"/> + <medi:field xmltag="departureTime"/> + <medi:field xmltag="rollingstockId"/> + <medi:field xmltag="departureSignature"/> + <medi:field xmltag="destinationSignature"/> + <medi:field xmltag="dayLimit"/> + + <medi:segment segcode="Tr" xmltag="route" minOccurs="0" maxOccurs="1"> + <medi:field xmltag="route"/> + </medi:segment> + + <medi:segment segcode="Fo" xmltag="vehicle" minOccurs="0" maxOccurs="-1"> + <medi:field xmltag="litt"/> + <medi:field xmltag="vehicleId"/> + <medi:field xmltag="originalLitt"/> + <medi:field xmltag="ticketId"/> + <medi:field xmltag="vehicleType"/> + <medi:field xmltag="weight"/> + <medi:field xmltag="dynamicWeight"/> + <medi:field xmltag="brakeWeight"/> + <medi:field xmltag="length"/> + <medi:field xmltag="nrOfAxles"/> + <medi:field xmltag="speed"/> + <medi:field xmltag="serviceType"/> + <medi:field xmltag="canDoorsBeLocked"/> + <medi:field xmltag="class1"/> + <medi:field xmltag="class2"/> + <medi:field xmltag="couchette"/> + <medi:field xmltag="nrOfCompartments"/> + <medi:field xmltag="nrOfPlacesPerCompartment"/> + <medi:field xmltag="departureStation"/> + <medi:field xmltag="departureDate"/> + <medi:field xmltag="departureTime"/> + <medi:field xmltag="destination"/> + + + <medi:segment segcode="Fx" xmltag="comments" minOccurs="0" maxOccurs="1"> + <medi:field xmltag="comment"/> + </medi:segment> + + <medi:segment segcode="Ft" xmltag="phoneNumber" minOccurs="0" maxOccurs="-1"> + <medi:field xmltag="litt"/> + <medi:field xmltag="vehicleId"/> + <medi:field xmltag="phoneNumber"/> + <medi:field xmltag="function"/> + <medi:field xmltag="location"/> + </medi:segment> + </medi:segment> + + </medi:segment> + + </medi:segments> + +</medi:edimap> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/sj-testimonial-edi-mapping.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-basic.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-basic.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-basic.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"> + + <resource-config selector="c b"> + <resource>example.BasicJavaTransformer</resource> + <param name="newName">xxx</param> + </resource-config> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-basic.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-to-xml.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-to-xml.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-to-xml.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"> + + <resource-config selector="global-parameters"> + <param name="stream.filter.type">SAX</param> + </resource-config> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/java-to-xml.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/profiling.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/profiling.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/profiling.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,43 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd"> + + <profiles> + <profile base-profile="message-exchange-1" sub-profiles="from-a,to-b" /> + <profile base-profile="message-exchange-2" sub-profiles="from-a,to-c" /> + <profile base-profile="message-exchange-3" sub-profiles="from-a,to-d" /> + + <profile base-profile="message-exchange-4" sub-profiles="from-c,to-b" /> + <profile base-profile="message-exchange-5" sub-profiles="from-d,to-b" /> + </profiles> + + <resource-config selector="a" target-profile="from-a"> + <resource>example.BasicJavaTransformer</resource> + <param name="newName">from-a</param> + </resource-config> + + <resource-config selector="a b" target-profile="to-b"> + <resource>example.BasicJavaTransformer</resource> + <param name="newName">to-b</param> + </resource-config> + + <resource-config selector="c b" target-profile="to-c"> + <resource>example.BasicJavaTransformer</resource> + <param name="newName">to-c</param> + </resource-config> + + <resource-config selector="c" target-profile="to-d"> + <resource>example.BasicJavaTransformer</resource> + <param name="newName">to-d</param> + </resource-config> + + <resource-config selector="b c" target-profile="message-exchange-5"> + <resource>example.BasicJavaTransformer</resource> + <param name="newName">message-exchange-5</param> + </resource-config> + + <resource-config selector="c b" target-profile="to-b AND from-d"> + <resource>example.BasicJavaTransformer</resource> + <param name="newName">d-to-b</param> + </resource-config> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks10/profiling.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/bindings.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/bindings.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/bindings.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"> + +  + + <jb:bindings beanId="message" class="java.util.HashMap" createOnElement="message-header"> + <jb:value property="date" data="message-header/date" decoder="Date"> + <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> + </jb:value> + </jb:bindings> + + <jb:bindings beanId="order" class="java.util.HashMap" createOnElement="order"> + <jb:value property="orderNum" data="order/order-id" decoder="Integer" /> + <jb:value property="customerUname" data="order/customer-details/username" /> + <jb:value property="status" data="order/status-code" decoder="Integer" /> + <jb:value property="net" data="order/net-amount" decoder="BigDecimal" /> + <jb:value property="total" data="order/total-amount" decoder="BigDecimal" /> + </jb:bindings> + + <jb:bindings beanId="orderItem" class="java.util.HashMap" createOnElement="order-item"> +  + <jb:value data="order-item/*" /> + </jb:bindings> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/bindings.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/csv-xml.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/csv-xml.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/csv-xml.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.1.xsd"> + +  + <csv:reader fields="firstname,lastname,gender,age,country" /> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/csv-xml.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/datasources.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/datasources.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/datasources.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:ds="http://www.milyn.org/xsd/smooks/datasource-1.1.xsd"> + + <ds:direct + bindOnElement="$document" + datasource="DBExtractTransformLoadDS" + driver="org.hsqldb.jdbcDriver" + url="jdbc:hsqldb:hsql://localhost:9201/milyn-hsql-9201" + username="sa" + password="" + autoCommit="false" /> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/datasources.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/db-extract-transform-load.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/db-extract-transform-load.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/db-extract-transform-load.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,56 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:db="http://www.milyn.org/xsd/smooks/db-routing-1.1.xsd"> + +  + <params> + <param name="stream.filter.type">SAX</param> + </params> + +  + <import file="edi-orders-parser.xml" /> + +  + <import file="datasources.xml"/> + +  + <import file="bindings.xml"/> + +  + +  + <db:executor executeOnElement="customer-details" datasource="DBExtractTransformLoadDS" executeBefore="true"> + <db:statement>select ORDERNUMBER from ORDERS where ORDERNUMBER = ${order.orderNum}</db:statement> + <db:resultSet name="orderExistsRS"/> + </db:executor> + +  + <db:executor executeOnElement="customer-details" datasource="DBExtractTransformLoadDS" executeBefore="false"> + <condition>orderExistsRS.isEmpty()</condition> + <db:statement>INSERT INTO ORDERS VALUES(${order.orderNum}, ${order.customerUname}, ${order.status}, ${order.net}, ${order.total}, ${message.date})</db:statement> + </db:executor> + +  + <db:executor executeOnElement="order-item" datasource="DBExtractTransformLoadDS" executeBefore="false"> + <condition>orderExistsRS.isEmpty()</condition> + <db:statement>INSERT INTO ORDERITEMS VALUES (${order.orderNum}, ${orderItem.quantity}, ${orderItem.productId}, ${orderItem.title}, ${orderItem.price})</db:statement> + </db:executor> + +  + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/db-extract-transform-load.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-orders-parser.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-orders-parser.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-orders-parser.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:edi="http://www.milyn.org/xsd/smooks/edi-1.1.xsd"> + +  + <edi:reader mappingModel="/edi-to-sax-order-mapping.xml" /> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-orders-parser.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-java.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-java.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-java.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,72 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:edi="http://www.milyn.org/xsd/smooks/edi-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"> + +  + <edi:reader mappingModel="/example/edi-to-xml-order-mapping.xml" /> + +  + <jb:bindings beanId="order" class="example.model.Order" createOnElement="order"> + <jb:wiring property="header" beanIdRef="header" /> + <jb:wiring property="orderItems" beanIdRef="orderItemList" /> + </jb:bindings> + +  + <jb:bindings beanId="header" class="example.model.Header" createOnElement="order"> + <jb:wiring property="customer" beanIdRef="customer" /> + <jb:value property="orderId" data="header/order-id" /> + <jb:value property="orderStatus" decoder="Long" data="header/status-code" /> + <jb:value property="netAmount" decoder="BigDecimal" data="header/net-amount" /> + <jb:value property="totalAmount" decoder="BigDecimal" data="header/total-amount" /> + <jb:value property="tax" decoder="BigDecimal" data="header/tax" /> + <jb:value property="date" decoder="Date" data="header/date"> + <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> + </jb:value> + </jb:bindings> + +  + <jb:bindings beanId="customer" class="example.model.Customer" createOnElement="customer-details"> +  + <jb:value property="userName" data="customer-details/username" /> + <jb:value property="firstName" data="customer-details/name/firstname" /> + <jb:value property="lastName" data="customer-details/name/lastname" /> + <jb:value property="state" data="customer-details/state" /> + </jb:bindings> + +  + <jb:bindings beanId="orderItemList" class="java.util.ArrayList" createOnElement="order"> + <jb:wiring beanIdRef="orderItem" /> + </jb:bindings> + +  + <jb:bindings beanId="orderItem" class="example.model.OrderItem" createOnElement="order-item"> +  + <jb:value property="quantity" decoder="Integer" data="order-item/quantity" /> + <jb:value property="productId" decoder="String" data="order-item/product-id" /> + <jb:value property="price" decoder="BigDecimal" data="order-item/price" /> + <jb:value property="title" data="order-item/title" /> + </jb:bindings> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-java.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-xml.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-xml.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-xml.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:edi="http://www.milyn.org/xsd/smooks/edi-1.1.xsd"> + +  + <edi:reader mappingModel="/example/edi-to-xml-order-mapping.xml" /> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/edi-to-xml.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/file-router.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/file-router.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/file-router.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd" + xmlns:file="http://www.milyn.org/xsd/smooks/file-routing-1.1.xsd" + xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd"> + +  + <params> + <param name="stream.filter.type">SAX</param> + </params> + +  + <jb:bindings beanId="order" class="java.util.Hashtable" createOnElement="order"> + <jb:value property="orderId" decoder="Integer" data="order/@id"/> + <jb:value property="customerNumber" decoder="Long" data="header/customer/@number"/> + <jb:value property="customerName" data="header/customer"/> + <jb:wiring property="orderItem" beanIdRef="orderItem"/> + </jb:bindings> + <jb:bindings beanId="orderItem" class="java.util.Hashtable" createOnElement="order-item"> + <jb:value property="itemId" decoder="Integer" data="order-item/@id"/> + <jb:value property="productId" decoder="Long" data="order-item/product"/> + <jb:value property="quantity" decoder="Integer" data="order-item/quantity"/> + <jb:value property="price" decoder="Double" data="order-item/price"/> + </jb:bindings> + +  + <file:outputStream openOnElement="order-item" resourceName="orderItemSplitStream"> + <file:fileNamePattern>order-${order.orderId}-${order.orderItem.itemId}.xml</file:fileNamePattern> + <file:destinationDirectoryPattern>target/orders</file:destinationDirectoryPattern> + <file:listFileNamePattern>order-${order.orderId}.lst</file:listFileNamePattern> + + <file:highWaterMark mark="3"/> + </file:outputStream> + +  + <ftl:freemarker applyOnElement="order-item"> + <ftl:template>target/classes/orderitem-split.ftl</ftl:template> + <ftl:use> +  + <ftl:outputTo outputStreamResource="orderItemSplitStream"/> + </ftl:use> + </ftl:freemarker> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/file-router.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/freemarker-huge-transform.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/freemarker-huge-transform.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/freemarker-huge-transform.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd"> + +  + <params> + <param name="stream.filter.type">SAX</param> + <param name="default.serialization.on">false</param> + </params> + +  + <resource-config selector="order,order-item"> + <resource>org.milyn.delivery.DomModelCreator</resource> + </resource-config> + +  + <ftl:freemarker applyOnElement="order-items"> + <ftl:template></ftl:template> + </ftl:freemarker> + +  +<ftl:freemarker applyOnElement="order-item"> + <ftl:template></ftl:template> +</ftl:freemarker> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/freemarker-huge-transform.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/groovy.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/groovy.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/groovy.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:g="http://www.milyn.org/xsd/smooks/groovy-1.1.xsd"> + + <params> + <param name="stream.filter.type">SAX</param> + </params> + + <g:groovy executeOnElement="category"> + <g:script> +  + </g:script> + </g:groovy> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/groovy.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/java-to-java.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/java-to-java.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/java-to-java.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"> + + <params> + <param name="stream.filter.type">SAX</param> + </params> + + <jb:bindings beanId="lineOrder" class="example.trgmodel.LineOrder" createOnElement="example.srcmodel.Order"> + <jb:wiring property="lineItems" beanIdRef="lineItems" /> + <jb:value property="customerId" data="header/customerNumber" /> + <jb:value property="customerName" data="header/customerName" /> + <jb:value property="priority" data="header/priority" decoder="Enum"> + <jb:decodeParam name="enumType">example.trgmodel.LineOrderPriority</jb:decodeParam> + <jb:decodeParam name="LOW">NOT_IMPORTANT</jb:decodeParam> + <jb:decodeParam name="MEDIUM">IMPORTANT</jb:decodeParam> + <jb:decodeParam name="HIGH">VERY_IMPORTANT</jb:decodeParam> + </jb:value> + </jb:bindings> + + <jb:bindings beanId="lineItems" class="example.trgmodel.LineItem[]" createOnElement="orderItems"> + <jb:wiring beanIdRef="lineItem" /> + </jb:bindings> + + + <jb:bindings beanId="lineItem" class="example.trgmodel.LineItem" createOnElement="example.srcmodel.OrderItem"> + <jb:value property="productCode" data="example.srcmodel.OrderItem/productId" /> + <jb:value property="unitQuantity" decoder="Integer" data="example.srcmodel.OrderItem/quantity" /> + <jb:value property="unitPrice" decoder="BigDecimal" data="example.srcmodel.OrderItem/price" /> + </jb:bindings> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/java-to-java.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/json-to-java.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/json-to-java.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/json-to-java.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,101 @@ +<?xml version="1.0"?> +<smooks-resource-list + xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:json="http://www.milyn.org/xsd/smooks/json-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"> + +  + <json:reader rootName="order" keyWhitspaceReplacement="-"> + <json:keyMap> + <json:key from="date&time" to="date-and-time" /> + </json:keyMap> + </json:reader> + + +  + <jb:bindings class="example.model.Order" beanId="order" createOnElement="order"> + <jb:wiring property="header" beanIdRef="header"/> + <jb:wiring property="orderItems" beanIdRef="orderItems"/> + </jb:bindings> + +  + <jb:bindings class="example.model.Header" beanId="header" createOnElement="order"> + <jb:wiring property="customer" beanIdRef="customer"/> + + <jb:value property="orderId" data="header order-id" /> + <jb:value property="orderStatus" data="header status-code" decoder="Long" /> + <jb:value property="netAmount" data="header net-amount" decoder="BigDecimal"/> + <jb:value property="totalAmount" data="header total-amount" decoder="BigDecimal"/> + <jb:value property="tax" data="header tax" decoder="BigDecimal"/> + <jb:value property="date" data="header date-and-time" decoder="Date"> + <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> + <jb:decodeParam name="locale-language">en</jb:decodeParam> + <jb:decodeParam name="locale-country">IE</jb:decodeParam> + </jb:value> + </jb:bindings> + +  + <jb:bindings class="example.model.Customer" beanId="customer" createOnElement="customer-details"> + <jb:value property="userName" data="customer-details username" /> + <jb:value property="firstName" data="customer-details firstname" /> + <jb:value property="lastName" data="customer-details lastname"/> + <jb:value property="state" data="customer-details state"/> + </jb:bindings> + +  + <jb:bindings class="java.util.ArrayList" beanId="orderItems" createOnElement="order"> + <jb:wiring beanIdRef="orderItem"/> + </jb:bindings> + +  + <jb:bindings class="example.model.OrderItem" beanId="orderItem" createOnElement="order-item element"> + <jb:value property="quantity" data="order-item element quantity" decoder="Integer"/> + <jb:value property="productId" data="order-item element product-id" /> + <jb:value property="price" data="order-item element price" decoder="BigDecimal" /> + <jb:value property="title" data="order-item element title" /> + </jb:bindings> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/json-to-java.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic-virtual.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic-virtual.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic-virtual.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd" + xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd"> + +  + <ftl:freemarker applyOnElement="$document"> + <ftl:template>/example/templates/HistoryTrans.ftl</ftl:template> + </ftl:freemarker> + +  + <jb:bindings beanId="history" class="java.util.HashMap" createOnElement="history"> + <jb:wiring property="warehouse" beanIdRef="warehouse"/> +  + <jb:value property="creationDate" decoder="Date" data="header/date" /> +  + <jb:value property="trackingNumbers" decoder="example.decoders.TrackingNumberDecoder" data="history/trackingNumbers" /> + </jb:bindings> + +  + <jb:bindings beanId="warehouse" class="java.util.HashMap" createOnElement="history"> + <jb:value property="id" decoder="Integer" data="history/@warehouse" /> +  + <jb:value property="name" decoder="Mapping" data="history/@warehouse"> + <jb:decodeParam name="1">Dublin</jb:decodeParam> + <jb:decodeParam name="2">Belfast</jb:decodeParam> + <jb:decodeParam name="3">Cork</jb:decodeParam> + </jb:value> + </jb:bindings> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic-virtual.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd" + xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd"> + +  + <ftl:freemarker applyOnElement="$document"> + <ftl:template>/example/templates/HistoryTrans.ftl</ftl:template> + </ftl:freemarker> + +  + <jb:bindings beanId="history" class="example.model.ShippingHistory" createOnElement="history"> + <jb:wiring property="warehouse" beanIdRef="warehouse"/> +  + <jb:value property="creationDate" decoder="Date" data="header/date" /> +  + <jb:value property="trackingNumbers" decoder="example.model.TrackingNumberDecoder" data="history/trackingNumbers" /> + </jb:bindings> + +  + <jb:bindings beanId="warehouse" class="example.model.Warehouse" createOnElement="history"> + <jb:value property="id" decoder="Integer" data="history/@warehouse" /> +  + <jb:value property="name" decoder="Mapping" data="history/@warehouse"> + <jb:decodeParam name="1">Dublin</jb:decodeParam> + <jb:decodeParam name="2">Belfast</jb:decodeParam> + <jb:decodeParam name="3">Cork</jb:decodeParam> + </jb:value> + </jb:bindings> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/model-driven-basic.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial-sax.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial-sax.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial-sax.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"> + + <params> + <param name="stream.filter.type">SAX</param> + </params> + + <import file="smooks-config.xml" /> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial-sax.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:edi="http://www.milyn.org/xsd/smooks/edi-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"> + + <edi:reader mappingModel="edi-mapping.xml" /> + + <jb:bindings beanId="rollingstocks" class="se.sj.ipl.rollingstock.domain.RollingStockList" createOnElement="rollingstocks"> + <jb:wiring setterMethod="add" beanIdRef="rollingstock"/> + </jb:bindings> + + <jb:bindings beanId="rollingstock" class="se.sj.ipl.rollingstock.domain.Rollingstock" createOnElement="rollingstocks/rollingstock"> + <jb:wiring property="schedule" beanIdRef="rollingstock_schedule" /> + <jb:wiring property="vehicles" beanIdRef="vehicles" /> + + <jb:value property="rollingstockId" data="rollingstock/rollingstockId" /> + <jb:value property="route" data="rollingstock/route/route" /> + </jb:bindings> + + <jb:bindings beanId="rollingstock_schedule" class="se.sj.ipl.rollingstock.domain.Schedule" createOnElement="rollingstocks/rollingstock"> + + <jb:value property="departureStation" data="rollingstock departureSignature" /> + <jb:value property="departureDate" decoder="Date" data="rollingstock departureDate" /> + <jb:value property="departureTime" decoder="Time" data="rollingstock departureTime" /> + <jb:value property="destination" data="rollingstock destinationSignature" /> + </jb:bindings> + + <jb:bindings beanId="vehicles" class="java.util.ArrayList" createOnElement="rollingstocks/rollingstock"> + <jb:wiring beanIdRef="vehicle" /> + </jb:bindings> + + + <jb:bindings beanId="vehicle" class="se.sj.ipl.rollingstock.domain.Vehicle" createOnElement="rollingstock/vehicle"> + <jb:wiring property="schedule" beanIdRef="vehicle_schedule"/> + <jb:wiring property="weight" beanIdRef="vehicle_weight"/> + <jb:wiring property="dynamicWeight" beanIdRef="vehicle_dynamic_weight"/> + <jb:wiring property="dynamicBrakeWeight" beanIdRef="vehicle_dynamic_brake_weight"/> + <jb:wiring property="length" beanIdRef="vehicle_length"/> + <jb:wiring property="speed" beanIdRef="vehicle_speed"/> + <jb:wiring property="comments" beanIdRef="vehicle_comments"/> + <jb:wiring property="phoneNumbers" beanIdRef="vehicle_phonenumbers"/> + <jb:wiring property="passengerCarConfiguration" beanIdRef="passenger_car_configuration" /> + + <jb:value property="litt" data="vehicle litt" /> + <jb:value property="originalLitt" data="vehicle originalLitt" /> + <jb:value property="ticketId" data="vehicle ticketId" /> + <jb:value property="vehicleId" data="vehicle vehicleId" /> + <jb:value property="vehicleType" data="vehicle vehicleType" /> + <jb:value property="nrOfAxles" decoder="Integer" data="vehicle nrOfAxles" /> + <jb:value property="serviceType" data="vehicle serviceType" /> + <jb:value property="canDoorsBeLocked" decoder="Boolean" data="vehicle canDoorsBeLocked" /> + <jb:value property="positionInTrainAssembly" decoder="Boolean" data="vehicle positionInTrainAssembly" /> + </jb:bindings> + + + <jb:bindings beanId="vehicle_schedule" class="se.sj.ipl.rollingstock.domain.Schedule" createOnElement="rollingstock/vehicle"> + <jb:value property="departureStation" data="vehicle departureStation" /> + <jb:value property="departureDate" decoder="Date" data="vehicle departureDate" /> + <jb:value property="departureTime" decoder="Time" data="vehicle departureTime" /> + <jb:value property="destination" data="vehicle destination" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_weight" class="se.sj.ipl.rollingstock.domain.types.Weight" createOnElement="rollingstock/vehicle"> + <jb:value property="weight" decoder="Double" data="vehicle weight" default="0" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_dynamic_weight" class="se.sj.ipl.rollingstock.domain.types.Weight" createOnElement="rollingstock/vehicle"> + <jb:value property="weight" decoder="Double" data="vehicle dynamicWeight" default="0" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_dynamic_brake_weight" class="se.sj.ipl.rollingstock.domain.types.Weight" createOnElement="rollingstock/vehicle"> + <jb:value property="weight" decoder="Double" data="vehicle brakeWeight" default="0" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_length" class="se.sj.ipl.rollingstock.domain.types.Length" createOnElement="rollingstock/vehicle"> + <jb:value property="length" decoder="Double" data="vehicle length" default="0" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_speed" class="se.sj.ipl.rollingstock.domain.types.Speed" createOnElement="rollingstock/vehicle"> + <jb:value property="speed" decoder="Double" data="vehicle speed" default="0" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_comments" class="java.util.ArrayList" createOnElement="rollingstock/vehicle"> + <jb:wiring beanIdRef="vehicle_comment" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_comments" class="se.sj.ipl.rollingstock.domain.Comment" createOnElement="rollingstock/vehicle/comments"> + <jb:value property="comment" data="comment" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_phonenumbers" class="java.util.ArrayList" createOnElement="rollingstock/vehicle"> + <jb:wiring beanIdRef="vehicle_phonenumber" /> + </jb:bindings> + + <jb:bindings beanId="vehicle_phonenumber" class="se.sj.ipl.rollingstock.domain.PhoneNumber" createOnElement="rollingstock/vehicle/phoneNumber"> + <jb:value property="function" data="phoneNumber/function" /> + <jb:value property="location" data="phoneNumber/location" /> + <jb:value property="number" data="phoneNumber/phoneNumber" /> + </jb:bindings> + + <jb:bindings beanId="passenger_car_configuration" class="se.sj.ipl.rollingstock.domain.PassengerCarConfiguration" createOnElement="rollingstock/vehicle"> + <jb:value property="class1" decoder="Integer" data="vehicle class1" default="0" /> + <jb:value property="class2" decoder="Integer" data="vehicle class2" default="0" /> + <jb:value property="couchette" decoder="Integer" data="vehicle couchette" default="0" /> + <jb:value property="compartments" decoder="Integer" data="vehicle compartments" default="0" /> + </jb:bindings> + + <resource-config selector="decoder:Time"> + <resource>org.milyn.javabean.decoders.SqlTimeDecoder</resource> + <param name="format">HH:mm:ss</param> + </resource-config> + + <resource-config selector="decoder:Date"> + <resource>org.milyn.javabean.decoders.SqlDateDecoder</resource> + <param name="format">yyyy-MM-dd</param> + </resource-config> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/sj-testimonial.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/splitter-router.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/splitter-router.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/splitter-router.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jms="http://www.milyn.org/xsd/smooks/jms-routing-1.1.xsd" + xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd"> + +  + <params> + <param name="stream.filter.type">SAX</param> + </params> + + <resource-config selector="order,order-item"> + <resource>org.milyn.delivery.DomModelCreator</resource> + </resource-config> + + <jms:router routeOnElement="order-item" beanId="orderItem_xml" destination="smooks.exampleQueue"> + <jms:message> +  + <jms:correlationIdPattern>${order.(a)id}-${.vars["order-item"].@id}</jms:correlationIdPattern> + </jms:message> + <jms:highWaterMark mark="3"/> + </jms:router> + + <ftl:freemarker applyOnElement="order-item"> +  + <ftl:template>/orderitem-split.ftl</ftl:template> + <ftl:use> +  + <ftl:bindTo id="orderItem_xml"/> + </ftl:use> + </ftl:freemarker> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/splitter-router.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java-virtual.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java-virtual.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java-virtual.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,51 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"> + +  + +  + <jb:bindings beanId="order" class="java.util.HashMap" createOnElement="order"> + <jb:wiring property="header" beanIdRef="header" /> + <jb:wiring property="orderItems" beanIdRef="orderItems" /> + </jb:bindings> + +  + <jb:bindings beanId="orderItems" class="java.util.ArrayList" createOnElement="order"> + <jb:wiring beanIdRef="orderItem" /> + </jb:bindings> + +  + <jb:bindings beanId="header" class="java.util.HashMap" createOnElement="header"> + <jb:value property="date" decoder="Date" data="header/date"> + <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> + <jb:decodeParam name="locale-language">en</jb:decodeParam> + <jb:decodeParam name="locale-country">IE</jb:decodeParam> + </jb:value> + <jb:value property="customerNumber" decoder="Long" data="header/customer/@number" /> + <jb:value property="customerName" data="header/customer" /> + </jb:bindings> + +  + <jb:bindings beanId="orderItem" class="java.util.HashMap" createOnElement="order-item"> + <jb:value property="productId" decoder="Long" data="order-item/product" /> + <jb:value property="quantity" decoder="Integer" data="order-item/quantity" /> + <jb:value property="price" decoder="Double" data="order-item/price" /> + </jb:bindings> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java-virtual.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,46 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"> + +  + <jb:bindings beanId="order" class="example.model.Order" createOnElement="order"> + <jb:wiring property="header" beanIdRef="header" /> + <jb:wiring property="orderItems" beanIdRef="orderItems" /> + </jb:bindings> + +  + <jb:bindings beanId="orderItems" class="java.util.ArrayList" createOnElement="order"> + <jb:wiring beanIdRef="orderItem" /> + </jb:bindings> + +  + <jb:bindings beanId="header" class="example.model.Header" createOnElement="header"> + <jb:value property="date" decoder="Date" data="header/date"> + <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> + <jb:decodeParam name="locale-language">en</jb:decodeParam> + <jb:decodeParam name="locale-country">IE</jb:decodeParam> + </jb:value> + <jb:value property="customerNumber" decoder="Long" data="header/customer/@number" /> + <jb:value property="customerName" data="header/customer" /> + </jb:bindings> + +  + <jb:bindings beanId="orderItem" class="example.model.OrderItem" createOnElement="order-item"> + <jb:value property="productId" decoder="Long" data="order-item/product" /> + <jb:value property="quantity" decoder="Integer" data="order-item/quantity" /> + <jb:value property="price" decoder="Double" data="order-item/price" /> + </jb:bindings> + +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xml-to-java.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-basic.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-basic.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-basic.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:xsl="http://www.milyn.org/xsd/smooks/xsl-1.1.xsd"> + + <xsl:xsl applyOnElement="c/b"> + <xsl:template>/example/BasicXslTransform.xsl</xsl:template> + </xsl:xsl> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-basic.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-groovy.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-groovy.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-groovy.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:xsl="http://www.milyn.org/xsd/smooks/xsl-1.1.xsd"> + +  + <resource-config selector="header date"> + <resource>/example/DateFormatter.groovy</resource> + <param name="input-format">EEE MMM dd HH:mm:ss z yyyy</param> + <param name="output-format"> + time=HH:mm + day=dd + month=MM + year=yy + </param> + </resource-config> + +  + <xsl:xsl applyOnElement="$document"> + <xsl:template>/example/order.xsl</xsl:template> + </xsl:xsl> + +</smooks-resource-list> Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-groovy.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-namespaces.xml =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-namespaces.xml (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-namespaces.xml 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:xsl="http://www.milyn.org/xsd/smooks/xsl-1.1.xsd"> + <xsl:xsl targetProfile="adffaa" applyOnElement="$d"> + <xsl:template> + + <![CDATA[<xsl:stylesheet + + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + + xmlns:xhtml="http://www.w3.org/1999/xhtml" + + exclude-result-prefixes="smk xhtml" + + xmlns:smk="http://milyn.codehaus.org/Smooks"> + + + + <xsl:output method="xml" encoding="UTF-8"/> + + + + <xsl:template match="/"> + + <CanonicalOrderFormat xmlns="http://canonical.codehaus.org/Order"> + + <orderId> + + <xsl:value-of select="./smk:Order/smk:header/smk:order-id"/> + + </orderId> + + <item> + + <productId> + + <xsl:value-of select="./smk:Order/smk:order-item/smk:product-id"/> + + </productId> + + <title> + + <xsl:value-of select="./smk:Order/smk:order-item/smk:title"/> + + </title> + + <price> + + <xsl:value-of select="./smk:Order/smk:order-item/smk:price"/> + + </price> + + </item> + + </CanonicalOrderFormat> + + </xsl:template> + + </xsl:stylesheet>]]></xsl:template> + </xsl:xsl> +</smooks-resource-list> \ No newline at end of file Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model/configfiles/smooks112/xslt-namespaces.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,170 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.test.model11; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.HashMap; + +import junit.framework.TestCase; + +import org.eclipse.emf.common.command.BasicCommandStack; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage.Registry; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; +import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.calc.CalcPackage; +import org.jboss.tools.smooks.model.calc.provider.CalcItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.common.CommonPackage; +import org.jboss.tools.smooks.model.common.provider.CommonItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.csv.CsvPackage; +import org.jboss.tools.smooks.model.csv.provider.CsvItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.datasource.DatasourcePackage; +import org.jboss.tools.smooks.model.datasource.provider.DatasourceItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.dbrouting.DbroutingPackage; +import org.jboss.tools.smooks.model.dbrouting.provider.DbroutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.edi.EdiPackage; +import org.jboss.tools.smooks.model.edi.provider.EdiItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage; +import org.jboss.tools.smooks.model.fileRouting.provider.FileRoutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage; +import org.jboss.tools.smooks.model.freemarker.provider.FreemarkerItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.groovy.GroovyPackage; +import org.jboss.tools.smooks.model.groovy.provider.GroovyItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.iorouting.IoroutingPackage; +import org.jboss.tools.smooks.model.iorouting.provider.IoroutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.javabean.JavabeanPackage; +import org.jboss.tools.smooks.model.javabean.provider.JavabeanItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage; +import org.jboss.tools.smooks.model.jmsrouting.provider.JmsroutingItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.json.JsonPackage; +import org.jboss.tools.smooks.model.json.provider.JsonItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.medi.MEdiPackage; +import org.jboss.tools.smooks.model.medi.provider.MEdiItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.smooks.SmooksPackage; +import org.jboss.tools.smooks.model.smooks.provider.SmooksItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.xsl.XslPackage; +import org.jboss.tools.smooks.model.xsl.provider.XslItemProviderAdapterFactory; +import org.jboss.tools.smooks10.model.smooks.util.SmooksResourceFactoryImpl; + +/** + * + * @author Dart (dpeng(a)redhat.com) + * + */ +public abstract class AbstractSmooks11ModelTestCase extends TestCase { + + protected ComposedAdapterFactory adapterFactory; + protected AdapterFactoryEditingDomain editingDomain; + protected EObject smooksModel; + + static{ + // regist emf model uri mapping + Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE); + Registry.INSTANCE.put(CalcPackage.eNS_URI, CalcPackage.eINSTANCE); + Registry.INSTANCE.put(CommonPackage.eNS_URI, CommonPackage.eINSTANCE); + Registry.INSTANCE.put(CsvPackage.eNS_URI, CsvPackage.eINSTANCE); + Registry.INSTANCE.put(DatasourcePackage.eNS_URI, DatasourcePackage.eINSTANCE); + Registry.INSTANCE.put(DbroutingPackage.eNS_URI, DbroutingPackage.eINSTANCE); + Registry.INSTANCE.put(EdiPackage.eNS_URI, EdiPackage.eINSTANCE); + Registry.INSTANCE.put(FileRoutingPackage.eNS_URI, FileRoutingPackage.eINSTANCE); + + Registry.INSTANCE.put(FreemarkerPackage.eNS_URI, FreemarkerPackage.eINSTANCE); + Registry.INSTANCE.put(GroovyPackage.eNS_URI, GroovyPackage.eINSTANCE); + Registry.INSTANCE.put(IoroutingPackage.eNS_URI, IoroutingPackage.eINSTANCE); + Registry.INSTANCE.put(JavabeanPackage.eNS_URI, JavabeanPackage.eINSTANCE); + Registry.INSTANCE.put(JmsroutingPackage.eNS_URI, JmsroutingPackage.eINSTANCE); + Registry.INSTANCE.put(JsonPackage.eNS_URI, JsonPackage.eINSTANCE); + Registry.INSTANCE.put(MEdiPackage.eNS_URI, MEdiPackage.eINSTANCE); + Registry.INSTANCE.put(XslPackage.eNS_URI, XslPackage.eINSTANCE); + + Registry.INSTANCE.put(org.jboss.tools.smooks10.model.smooks.SmooksPackage.eNS_URI, org.jboss.tools.smooks10.model.smooks.SmooksPackage.eINSTANCE); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + // init emf editingdomain + adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + + adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new XslItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new FreemarkerItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new JavabeanItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CommonItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new SmooksItemProviderAdapterFactory()); + + adapterFactory.addAdapterFactory(new org.jboss.tools.smooks10.model.smooks.provider.SmooksItemProviderAdapterFactory()); + + adapterFactory.addAdapterFactory(new MEdiItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new EdiItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new IoroutingItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new JsonItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new JmsroutingItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new DbroutingItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CsvItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new DatasourceItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new CalcItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new GroovyItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new FileRoutingItemProviderAdapterFactory()); + adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); + + BasicCommandStack commandStack = new BasicCommandStack(); + editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>()); + + loadConfigFile() ; + } + + protected void loadConfigFile() throws IOException{ + Resource smooksResource = new SmooksResourceFactoryImpl().createResource(null); + smooksResource.load(getConfigFileContents() , Collections.emptyMap()); + smooksModel = smooksResource.getContents().get(0); + editingDomain.getResourceSet().getResources().add(smooksResource); + } + + abstract protected InputStream getConfigFileContents(); + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public ComposedAdapterFactory getAdapterFactory() { + return adapterFactory; + } + + public void setAdapterFactory(ComposedAdapterFactory adapterFactory) { + this.adapterFactory = adapterFactory; + } + + public AdapterFactoryEditingDomain getEditingDomain() { + return editingDomain; + } + + public void setEditingDomain(AdapterFactoryEditingDomain editingDomain) { + this.editingDomain = editingDomain; + } + + public EObject getSmooksModel() { + return smooksModel; + } + + public void setSmooksModel(EObject smooksModel) { + this.smooksModel = smooksModel; + } + + + +} Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/AbstractSmooks11ModelTestCase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java 2009-04-22 08:39:17 UTC (rev 14846) @@ -0,0 +1,85 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.test.model11; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Collections; + +import junit.framework.Assert; + +import org.eclipse.emf.ecore.resource.Resource; +import org.jboss.tools.smooks.model.smooks.DocumentRoot; +import org.jboss.tools.smooks10.model.smooks.util.SmooksResourceFactoryImpl; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class ParseConfigFileTestCase extends AbstractSmooks11ModelTestCase { + + @Override + protected void loadConfigFile() throws IOException { + // do nothing + } + + @Override + protected InputStream getConfigFileContents() { + return null; + } + + private void loadFile(File file) throws IOException { + if (file.exists() && file.isDirectory()) { + File[] configFiles = file.listFiles(); + for (int i = 0; i < configFiles.length; i++) { + File configFile = configFiles[i]; + if (configFile.isFile()) { + FileInputStream inputStream = new FileInputStream(configFile); + Resource smooksResource = new SmooksResourceFactoryImpl().createResource(null); + if (inputStream != null) { + smooksResource.load(inputStream, Collections.emptyMap()); + smooksModel = smooksResource.getContents().get(0); + Assert.assertNotNull(smooksModel); + Assert.assertTrue(smooksModel instanceof org.jboss.tools.smooks.model.medi.DocumentRoot + || smooksModel instanceof DocumentRoot + || smooksModel instanceof org.jboss.tools.smooks10.model.smooks.DocumentRoot); + if (smooksModel instanceof DocumentRoot) { + System.out.println("load smooks 1.1.2 config file : \"" + file.getName() +"/"+ configFile.getName() + + "\" success."); + } + if (smooksModel instanceof org.jboss.tools.smooks.model.medi.DocumentRoot) { + System.out.println("load edi-message-mapping-1.0 file config file : \"" + file.getName() +"/"+ configFile.getName() + + "\" success."); + } + if (smooksModel instanceof org.jboss.tools.smooks10.model.smooks.DocumentRoot) { + System.out.println("load smooks 1.0 config file : \"" + file.getName() +"/"+ configFile.getName() + + "\" success."); + } + } + } + + if (configFile.isDirectory()) { + loadFile(configFile); + } + } + } + } + + public void testParseConfigFile() throws IOException { + URL configFileFolder = this.getClass().getClassLoader().getResource( + "org/jboss/tools/smooks/test/model/configfiles"); + File file = new File(configFileFolder.getFile()); + loadFile(file); + } +} Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/model11/ParseConfigFileTestCase.java ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r14845 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-04-22 04:15:57 -0400 (Wed, 22 Apr 2009) New Revision: 14845 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java Log: JBIDE-4216 - stupid stupid error Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2009-04-22 07:51:56 UTC (rev 14844) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2009-04-22 08:15:57 UTC (rev 14845) @@ -213,7 +213,7 @@ this.priority = priority; this.publisher = publisher; isZipDelegate = Boolean.parseBoolean(zipDelegate); - element = element; + this.element = element; } private IJBossServerPublisher getNewInstance() { try {

16 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2009