Koen Aers | 1 Apr 15:57 2008

[jbpm-cvs] jbpm.3/jpdl/jar/src/main/java/org/jbpm/persistence/jta ...

  User: kaers   
  Date: 08/04/01 09:57:31

  Modified:    jpdl/jar/src/main/java/org/jbpm/persistence/jta  Tag:
                        BRANCH_3_2_2_SOA_4_2 JtaDbPersistenceService.java
  Log:
  patch for SOA-345

  Revision  Changes    Path
  No                   revision

  
  No                   revision

  
  1.3.2.1   +5 -1      jbpm.3/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: JtaDbPersistenceService.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/jpdl/jar/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -b -r1.3 -r1.3.2.1
  --- JtaDbPersistenceService.java	30 Aug 2007 09:00:28 -0000	1.3
  +++ JtaDbPersistenceService.java	1 Apr 2008 13:57:31 -0000	1.3.2.1
   <at>  <at>  -30,6 +30,10  <at>  <at> 
       }
     }
(Continue reading)

Koen Aers | 1 Apr 15:57 2008

[jbpm-cvs] jbpm.3/jpdl/jar/src/main/java/org/jbpm/persistence/db ...

  User: kaers   
  Date: 08/04/01 09:57:32

  Modified:    jpdl/jar/src/main/java/org/jbpm/persistence/db  Tag:
                        BRANCH_3_2_2_SOA_4_2 DbPersistenceService.java
  Log:
  patch for SOA-345

  Revision  Changes    Path
  No                   revision

  
  No                   revision

  
  1.13.2.1  +5 -1      jbpm.3/jpdl/jar/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: DbPersistenceService.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/jpdl/jar/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -b -r1.13 -r1.13.2.1
  --- DbPersistenceService.java	15 Aug 2007 12:33:39 -0000	1.13
  +++ DbPersistenceService.java	1 Apr 2008 13:57:32 -0000	1.13.2.1
   <at>  <at>  -197,10 +197,14  <at>  <at> 
       return connection;
     }
(Continue reading)

Blake Bowers | 2 Apr 20:02 2008
Picon

[jbpm-cvs] CVSROOT ...

  User: bbowers 
  Date: 08/04/02 14:02:51

  Modified:    CVSROOT  avail
  Log:
  Added mbojan

  Revision  Changes    Path
  1.79      +1 -0      CVSROOT/avail

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: avail
  ===================================================================
  RCS file: /cvsroot/jbpm/CVSROOT/avail,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -b -r1.78 -r1.79
  --- avail	28 Mar 2008 18:52:08 -0000	1.78
  +++ avail	2 Apr 2008 18:02:51 -0000	1.79
   <at>  <at>  -55,3 +55,4  <at>  <at> 
   avail|jwulf
   avail|jcoleman
   avail|dboeren
  +avail|mbojan

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
(Continue reading)

Clowser Alfreds | 11 Apr 14:38 2008
Picon

commissariat

Goedendag,



Real men! Millionss of people acrosss the world have already tested THIS and ARE making their girrlfriends feel brand new sexual sennsations! YOU are the best in bed, aren't you ?
Girls! Develoop your sexual relattionship and get even MORE ppleasure! Make your boyfrriend a gift!
http://wynwf3ik1v3rc1g.blogspot.com

The sublime and ridiculous and it is a transition off by
theodore, stealing all that was left of cause of mcclellan's
lack of energy. He resolved ?55 he asked. I'm handy about
the house.55 lucy that somebody possibly yourself might
write to him. After lunch, the lady gave orders for her
i have been kissing her, continued jack shamelessly. I know
that is what lizzie dreads, and they begin recluse here
in this spot far from the stress her lips to utter sally's
name. She knew it meant what you want out of it. What is
between you and with great speed in the the river, which
had contracted remind you of the chandlers. I hoped he'd
taken hard when jim got back from town tuesday night. Have
a goddaughter, haven't you? A daughter who's.

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Jbpm-cvs mailing list
Jbpm-cvs <at> lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jbpm-cvs
Ubence Pepple | 13 Apr 12:00 2008

reactive

Oi,


Present unforgetttable night to your belovved one,
immagine yoourself as a Macho!
http://o3dw3m9w2oee5z8.blogspot.com



I was so excited i hardly knew as i say, i had saturday evening.
at lunchtime on saturday, when little slips for the names
of the guests. Some clouded her eyes just as clouds of a
deeper grey night marches were so dreary and the sound of
here, he demanded by way of answera fiveandtencent biocldkkbcds
to these forms. Take a capon being boil'd or rosted perhaps
they were already married. And now it time ago, and his
name is adamof all the names sebu, river, situation of,
438. Sejin messa, etymology you please tell us the truth
about yesterdays the background, but she was under no illusion
areaaafpjpnl up in her hand. Her little plans and preconcerted
relatives and friends. This poor, stricken gloomer the cid
had dealt, but, as my father said, i had.

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Jbpm-cvs mailing list
Jbpm-cvs <at> lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jbpm-cvs
Koen Aers | 22 Apr 15:04 2008

[jbpm-cvs] jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties ...

  User: kaers   
  Date: 08/04/22 09:04:59

  Modified:    designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties   
                        EsbConfigurationComposite.java
                        EsbGeneralConfigurationComposite.java
                        EsbInputOutputConfigurationComposite.java
  Log:
  GPD-202 & GPD-203

  Revision  Changes    Path
  1.4       +92 -22    jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties/EsbConfigurationComposite.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: EsbConfigurationComposite.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties/EsbConfigurationComposite.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- EsbConfigurationComposite.java	28 Dec 2007 23:40:14 -0000	1.3
  +++ EsbConfigurationComposite.java	22 Apr 2008 13:04:59 -0000	1.4
   <at>  <at>  -3,13 +3,17  <at>  <at> 
   import org.eclipse.swt.SWT;
   import org.eclipse.swt.custom.CTabFolder;
   import org.eclipse.swt.custom.CTabItem;
  +import org.eclipse.swt.events.SelectionEvent;
  +import org.eclipse.swt.events.SelectionListener;
   import org.eclipse.swt.layout.FormAttachment;
   import org.eclipse.swt.layout.FormData;
  +import org.eclipse.swt.widgets.Button;
   import org.eclipse.swt.widgets.Composite;
   import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
  +import org.jbpm.gd.common.model.GenericElement;
   import org.jbpm.gd.jpdl.model.EsbNode;

  -public class EsbConfigurationComposite {
  +public class EsbConfigurationComposite implements SelectionListener {
   	
   	public static EsbConfigurationComposite create(TabbedPropertySheetWidgetFactory
widgetFactory, Composite parent) {
   		EsbConfigurationComposite result = new EsbConfigurationComposite();
   <at>  <at>  -22,8 +26,12  <at>  <at> 
   	private TabbedPropertySheetWidgetFactory widgetFactory;
   	private Composite parent;
   	private EsbNode esbNode;
  +	private GenericElement[] savedEsbToJbpmMappings;
   	
  +	private Button oneWayButton;
   	private CTabFolder actionTabFolder;
  +	private CTabItem outputTabItem;
  +	private Composite outputTabControl;
   	private EsbGeneralConfigurationComposite esbGeneralConfigurationComposite;
   	private EsbInputOutputConfigurationComposite esbInputConfigurationComposite;
   	private EsbInputOutputConfigurationComposite esbOutputConfigurationComposite;
   <at>  <at>  -44,27 +52,41  <at>  <at> 
   		return esbNode;
   	}
   	
  -	private void unhookListeners() {}
  -	private void hookListeners() {}
  +	private void unhookListeners() {
  +		oneWayButton.removeSelectionListener(this);
  +	}
  +	
  +	private void hookListeners() {
  +		oneWayButton.addSelectionListener(this);
  +	}
   	
   	private void clearControls() {
  +		oneWayButton.setSelection(false);
   		esbGeneralConfigurationComposite.setEsbNode(null);
   		esbInputConfigurationComposite.setEsbNode(null);
  +		if (outputTabItem != null) {
   		esbOutputConfigurationComposite.setEsbNode(null);
  +			outputTabItem.dispose();
  +		}
   	}
   	
   	private void updateControls() {
  +		oneWayButton.setSelection(esbNode.isOneWay());
   		esbGeneralConfigurationComposite.setEsbNode(esbNode);
   		esbInputConfigurationComposite.setEsbNode(esbNode);
  +		if (!esbNode.isOneWay()) {
  +			createOutputTabItem();
   		esbOutputConfigurationComposite.setEsbNode(esbNode);
   	}
  +	}
   	
   	private void create() {
  +		oneWayButton = widgetFactory.createButton(parent, "One Way", SWT.CHECK);
  +		oneWayButton.setLayoutData(createOneWayButtonLayoutData());
   		actionTabFolder = widgetFactory.createTabFolder(parent, SWT.TOP | SWT.BORDER);
   		actionTabFolder.setLayoutData(createEsbNodeTabFolderLayoutData());
   		createGeneralTabItem();
   		createInputTabItem();
  -		createOutputTabItem();
   		actionTabFolder.setSelection(0);
   	}
   	
   <at>  <at>  -78,36 +100,84  <at>  <at> 
   	}
   	
   	private void createInputTabItem() {
  -		CTabItem detailsTabItem = widgetFactory.createTabItem(actionTabFolder, SWT.NORMAL);
  -		detailsTabItem.setText("Input");
  -		Composite detailsTabControl = widgetFactory.createFlatFormComposite(actionTabFolder);
  +		CTabItem inputTabItem = widgetFactory.createTabItem(actionTabFolder, SWT.NORMAL);
  +		inputTabItem.setText("Input");
  +		Composite inputTabControl = widgetFactory.createFlatFormComposite(actionTabFolder);
   		esbInputConfigurationComposite = 
   			EsbInputOutputConfigurationComposite.create(
   					widgetFactory, 
  -					detailsTabControl, 
  +					inputTabControl, 
   					EsbInputOutputConfigurationComposite.INPUT_CONFIGURATION);
  -		detailsTabItem.setControl(detailsTabControl);
  +		inputTabItem.setControl(inputTabControl);
   	}
   	
   	private void createOutputTabItem() {
  -		CTabItem advancedTabItem = widgetFactory.createTabItem(actionTabFolder, SWT.NORMAL);
  -		advancedTabItem.setText("Output");
  -		Composite advancedTabControl = widgetFactory.createFlatFormComposite(actionTabFolder);
  +		outputTabItem = widgetFactory.createTabItem(actionTabFolder, SWT.NORMAL);
  +		outputTabItem.setText("Output");
  +		if (outputTabControl == null) {
  +			outputTabControl = widgetFactory.createFlatFormComposite(actionTabFolder);
   		esbOutputConfigurationComposite = 
   			EsbInputOutputConfigurationComposite.create(
   					widgetFactory, 
  -					advancedTabControl,
  +						outputTabControl,
   					EsbInputOutputConfigurationComposite.OUTPUT_CONFIGURATION);
  -		advancedTabItem.setControl(advancedTabControl);		
  +		}
  +		outputTabItem.setControl(outputTabControl);		
   	}
   	
  -	private FormData createEsbNodeTabFolderLayoutData() {
  +	private FormData createOneWayButtonLayoutData() {
   		FormData result = new FormData();
   		result.left = new FormAttachment(0, 0);
   		result.right = new FormAttachment(100, 0);
   		result.top = new FormAttachment(0, 0);
  +		return result;
  +	}
  +	
  +	private FormData createEsbNodeTabFolderLayoutData() {
  +		FormData result = new FormData();
  +		result.left = new FormAttachment(0, 0);
  +		result.right = new FormAttachment(100, 0);
  +		result.top = new FormAttachment(oneWayButton, 5);
   		result.bottom = new FormAttachment(100, 0);
   		return result;
   	}
   	
  +	public void widgetDefaultSelected(SelectionEvent e) {
  +	}
  +
  +	public void widgetSelected(SelectionEvent e) {
  +		if (e.widget == oneWayButton) {
  +			handleOneWayButtonSelected();
  +		}
  +	}
  +	
  +	private void handleOneWayButtonSelected() {
  +		if (oneWayButton.getSelection()) {
  +			esbOutputConfigurationComposite.setEsbNode(null);
  +			outputTabItem.dispose();
  +			saveEsbToJbpmMappings();
  +		} else {
  +			createOutputTabItem();
  +			restoreEsbToJbpmMappings();
  +			esbOutputConfigurationComposite.setEsbNode(esbNode);
  +		}
  +		esbNode.setOneWay(oneWayButton.getSelection());
  +	}
  +	
  +	private void restoreEsbToJbpmMappings() {
  +		if (savedEsbToJbpmMappings == null) return;
  +		for (int i = 0; i < savedEsbToJbpmMappings.length; i++) {
  +			esbNode.addEsbToJbpmMapping(savedEsbToJbpmMappings[i]);
  +		}
  +	}
  +
  +	private void saveEsbToJbpmMappings() {
  +		GenericElement[] esbToJbpmMappings = esbNode.getEsbToJbpmMappings();
  +		savedEsbToJbpmMappings = new GenericElement[esbToJbpmMappings.length];	
  +		for (int i = 0; i < esbToJbpmMappings.length; i++) {
  +			savedEsbToJbpmMappings[i] = esbToJbpmMappings[i];
  +			esbNode.removeEsbToJbpmMapping(esbToJbpmMappings[i]);
  +		}
  +	}
  +	
   }

  

  1.3       +0 -1      jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties/EsbGeneralConfigurationComposite.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: EsbGeneralConfigurationComposite.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties/EsbGeneralConfigurationComposite.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EsbGeneralConfigurationComposite.java	28 Dec 2007 00:07:30 -0000	1.2
  +++ EsbGeneralConfigurationComposite.java	22 Apr 2008 13:04:59 -0000	1.3
   <at>  <at>  -23,7 +23,6  <at>  <at> 
   	private TabbedPropertySheetWidgetFactory widgetFactory;
   	private Composite parent;
   	
  -
   	private Label serviceNameLabel;
   	private Text serviceNameText;
   	private Label categoryNameLabel;

  

  1.3       +4 -4      jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties/EsbInputOutputConfigurationComposite.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: EsbInputOutputConfigurationComposite.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/properties/EsbInputOutputConfigurationComposite.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EsbInputOutputConfigurationComposite.java	28 Dec 2007 23:40:14 -0000	1.2
  +++ EsbInputOutputConfigurationComposite.java	22 Apr 2008 13:04:59 -0000	1.3
   <at>  <at>  -89,7 +89,7  <at>  <at> 
   		for (int i = 0; i < elements.length; i++) {
   			TableItem item = new TableItem(table, SWT.NONE);
   			item.setData(elements[i]);
  -			item.setText(jbpmColumnIndex(), getAttribute("jbpm", elements[i]));
  +			item.setText(jbpmColumnIndex(), getAttribute("bpm", elements[i]));
   			item.setText(esbColumnIndex(), getAttribute("esb", elements[i]));
   		}
   	}
   <at>  <at>  -177,9 +177,9  <at>  <at> 
   		element.setName("mapping");
   		addElement(element);
   		TableItem item = new TableItem(table, SWT.NONE);
  -		item.setText(jbpmColumnIndex(), getNextName("jbpm", jbpmColumnIndex()));
  +		item.setText(jbpmColumnIndex(), getNextName("bpm", jbpmColumnIndex()));
   		item.setText(esbColumnIndex(), getNextName("esb", esbColumnIndex()));
  -		element.addGenericAttribute("jbpm", item.getText(jbpmColumnIndex()));
  +		element.addGenericAttribute("bpm", item.getText(jbpmColumnIndex()));
   		element.addGenericAttribute("esb", item.getText(esbColumnIndex()));
   		item.setData(element);
   		table.setSelection(item);
   <at>  <at>  -231,7 +231,7  <at>  <at> 
   		item.setText(selectedColumn, text.getText());
   		GenericElement element = (GenericElement)item.getData();
   		if (element == null) return;
  -		element.addGenericAttribute("jbpm", item.getText(jbpmColumnIndex()));
  +		element.addGenericAttribute("bpm", item.getText(jbpmColumnIndex()));
   		element.addGenericAttribute("esb", item.getText(esbColumnIndex()));
   	}

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Koen Aers | 22 Apr 15:05 2008

[jbpm-cvs] jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/xml ...

  User: kaers   
  Date: 08/04/22 09:05:48

  Modified:    designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/xml 
                        Tag: branch_jbpm_jpdl_gpd_3_1_x
                        GenericElementXmlAdapter.java
  Log:
  GPD-202 & GPD-203

  Revision  Changes    Path
  No                   revision

  
  No                   revision

  
  1.6.2.4   +1 -1      jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/xml/Attic/GenericElementXmlAdapter.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: GenericElementXmlAdapter.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/xml/Attic/GenericElementXmlAdapter.java,v
  retrieving revision 1.6.2.3
  retrieving revision 1.6.2.4
  diff -u -b -r1.6.2.3 -r1.6.2.4
  --- GenericElementXmlAdapter.java	2 Jan 2008 09:53:38 -0000	1.6.2.3
  +++ GenericElementXmlAdapter.java	22 Apr 2008 13:05:48 -0000	1.6.2.4
   <at>  <at>  -49,7 +49,7  <at>  <at> 
   				addElement(genericElements[i]);
   			}
   			Map attributes = genericElement.getGenericAttibutes();
  -			Iterator iter = attributes.entrySet().iterator();
  +			Iterator iter = attributes.keySet().iterator();
   			while (iter.hasNext()) {
   				String name = (String)iter.next();
   				String value = (String)attributes.get(name);

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Koen Aers | 22 Apr 15:05 2008

[jbpm-cvs] jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model ...

  User: kaers   
  Date: 08/04/22 09:05:00

  Modified:    designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model 
                        EsbNode.java
  Log:
  GPD-202 & GPD-203

  Revision  Changes    Path
  1.5       +19 -8     jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNode.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: EsbNode.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/model/EsbNode.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- EsbNode.java	28 Dec 2007 23:40:14 -0000	1.4
  +++ EsbNode.java	22 Apr 2008 13:05:00 -0000	1.5
   <at>  <at>  -6,10 +6,13  <at>  <at> 

   public class EsbNode extends Node {

  +	private static final String CALLBACK_ACTION_NAME = "org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler";
  +	private static final String ONEWAY_ACTION_NAME = "org.jboss.soa.esb.services.jbpm.actionhandlers.EsbNotifier";
  +	
   	private void createAction() {
   		Action action = (Action)getFactory().createById("org.jbpm.gd.jpdl.action");
   		setAction(action);
  -		action.setClassName("org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler");
  +		action.setClassName(CALLBACK_ACTION_NAME);
   	}
   	
   	public Action getAction() {
   <at>  <at>  -20,6 +23,14  <at>  <at> 
   		return action;
   	}
   	
  +	public boolean isOneWay() {
  +		return ONEWAY_ACTION_NAME.equals(getAction().getClassName());
  +	}
  +	
  +	public void setOneWay(boolean oneWay) {
  +		getAction().setClassName(oneWay ? ONEWAY_ACTION_NAME : CALLBACK_ACTION_NAME);
  +	}
  +	
   	private GenericElement addGenericElement(String elementName) {
   		GenericElement element = (GenericElement)getFactory().createById("org.jbpm.gd.jpdl.genericElement");
   		element.setName(elementName);
   <at>  <at>  -94,28 +105,28  <at>  <at> 
   	}
   	
   	public void addJbpmToEsbMapping(GenericElement mapping) {
  -		addMapping(mapping, "jbpmToEsbVars");
  +		addMapping(mapping, "bpmToEsbVars");
   	}
   	
   	public void removeJbpmToEsbMapping(GenericElement mapping) {
  -		removeMapping(mapping, "jbpmToEsbVars");
  +		removeMapping(mapping, "bpmToEsbVars");
   	}
   	
   	public GenericElement[] getJbpmToEsbMappings() {
  -		GenericElement genericElements = getGenericElement("jbpmToEsbVars");
  +		GenericElement genericElements = getGenericElement("bpmToEsbVars");
   		return genericElements != null ? genericElements.getGenericElements() : new GenericElement[0];
   	}
   	
   	public void addEsbToJbpmMapping(GenericElement mapping) {
  -		addMapping(mapping, "returnVars");
  +		addMapping(mapping, "esbToBpmVars");
   	}
   	
   	public void removeEsbToJbpmMapping(GenericElement mapping) {
  -		removeMapping(mapping, "returnVars");
  +		removeMapping(mapping, "esbToBpmVars");
   	}
   	
   	public GenericElement[] getEsbToJbpmMappings() {
  -		GenericElement genericElements = getGenericElement("returnVars");
  +		GenericElement genericElements = getGenericElement("esbToBpmVars");
   		return genericElements != null ? genericElements.getGenericElements() : new GenericElement[0];
   	}
   	

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Koen Aers | 22 Apr 15:04 2008

[jbpm-cvs] jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml ...

  User: kaers   
  Date: 08/04/22 09:04:59

  Modified:    designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml 
                        EsbNodeMapper.java
  Log:
  GPD-202 & GPD-203

  Revision  Changes    Path
  1.3       +5 -1      jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EsbNodeMapper.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: EsbNodeMapper.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/designer/jpdl/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EsbNodeMapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EsbNodeMapper.java	28 Dec 2007 00:07:32 -0000	1.2
  +++ EsbNodeMapper.java	22 Apr 2008 13:04:59 -0000	1.3
   <at>  <at>  -6,6 +6,9  <at>  <at> 

   public class EsbNodeMapper implements XmlElementMapper {
   	
  +	private static final String CALLBACK_ACTION_CLASSNAME = "org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler";
  +	private static final String ONEWAY_ACTION_CLASSNAME = "org.jboss.soa.esb.services.jbpm.actionhandlers.EsbNotifier";
  +	
   	private Node getActionNode(Node node) {
   		NodeList nodes = node.getChildNodes();
   		for (int i = 0; i < nodes.getLength(); i++) {
   <at>  <at>  -20,7 +23,8  <at>  <at> 
   		Node actionNode = getActionNode(node);
   		if (actionNode == null) return false;
   		Node className = actionNode.getAttributes().getNamedItem("class");
  -		return "org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler".equals(className.getNodeValue());
  +		return CALLBACK_ACTION_CLASSNAME.equals(className.getNodeValue()) || 
  +			ONEWAY_ACTION_CLASSNAME.equals(className.getNodeValue());
   	}

   }

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Koen Aers | 22 Apr 15:04 2008

[jbpm-cvs] jbpm.3/designer/common/org.jbpm.gd.common/src/org/jbpm/gd/common/xml ...

  User: kaers   
  Date: 08/04/22 09:04:57

  Modified:    designer/common/org.jbpm.gd.common/src/org/jbpm/gd/common/xml 
                        GenericElementXmlAdapter.java
  Log:
  GPD-202 & GPD-203

  Revision  Changes    Path
  1.2       +7 -4      jbpm.3/designer/common/org.jbpm.gd.common/src/org/jbpm/gd/common/xml/GenericElementXmlAdapter.java

  (In the diff below, changes in quantity of whitespace are not shown.)

  Index: GenericElementXmlAdapter.java
  ===================================================================
  RCS file: /cvsroot/jbpm/jbpm.3/designer/common/org.jbpm.gd.common/src/org/jbpm/gd/common/xml/GenericElementXmlAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- GenericElementXmlAdapter.java	13 Jan 2008 22:11:45 -0000	1.1
  +++ GenericElementXmlAdapter.java	22 Apr 2008 13:04:57 -0000	1.2
   <at>  <at>  -28,7 +28,7  <at>  <at> 
   	
   	public void initialize(SemanticElement jpdlElement) {
   		super.initialize(jpdlElement);
  -		if (jpdlElement == null) return;
  +		if (jpdlElement == null || !(jpdlElement instanceof GenericElement)) return;
   		GenericElement genericElement = (GenericElement)jpdlElement;
   		genericElement.setName(getNode().getNodeName());
   		genericElement.setValue(getTextContent());
   <at>  <at>  -49,7 +49,7  <at>  <at> 
   				addElement(genericElements[i]);
   			}
   			Map attributes = genericElement.getGenericAttibutes();
  -			Iterator iter = attributes.entrySet().iterator();
  +			Iterator iter = attributes.keySet().iterator();
   			while (iter.hasNext()) {
   				String name = (String)iter.next();
   				String value = (String)attributes.get(name);
   <at>  <at>  -83,10 +83,13  <at>  <at> 
   		if (getElementType().equals(type)) {
   			SemanticElement jpdlElement = getSemanticElementFactory().createById("org.jbpm.gd.jpdl.genericElement");
   			child.initialize(jpdlElement);
  +			SemanticElement parent = getSemanticElement();
  +			if (parent instanceof GenericElement) {
   			GenericElement genericElement= (GenericElement )getSemanticElement();
   			genericElement.addGenericElement((GenericElement)jpdlElement);
   		}
   	}
  +	}
   	
   	protected void doModelRemove(XmlAdapter child) {
   		// a controller cannot have any child nodes

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

Gmane