[jbpm-commits] JBoss JBPM SVN: r4564 - in jbpm4/trunk/modules: examples/src/test/resources and 5 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-04-16 07:50:42 -0400 (Thu, 16 Apr 2009) New Revision: 4564 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JbossIdmIdentitySessionFactoryBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionFactoryBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionFactoryDescriptor.java Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml Log: renaming the jboss idm bindings and descriptors in line with the config elements Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-04-16 10:55:45 UTC (rev 4563) +++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-04-16 11:50:42 UTC (rev 4564) @@ -49,7 +49,8 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> <!-- db sessions --> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 10:55:45 UTC (rev 4563) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 11:50:42 UTC (rev 4564) @@ -49,7 +49,8 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> <!-- db sessions --> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 10:55:45 UTC (rev 4563) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 11:50:42 UTC (rev 4564) @@ -49,7 +49,8 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> <!-- db sessions --> Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionFactoryBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionFactoryBinding.java 2009-04-16 10:55:45 UTC (rev 4563) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionFactoryBinding.java 2009-04-16 11:50:42 UTC (rev 4564) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.wire.binding; - -import org.jbpm.pvm.internal.wire.descriptor.IdentitySessionFactoryDescriptor; -import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Element; - - -/** - * @author Tom Baeyens - */ -public class IdentitySessionFactoryBinding extends WireDescriptorBinding { - - public IdentitySessionFactoryBinding() { - super("jboss-idm-identity-session-factory"); - } - - public Object parse(Element element, Parse parse, Parser parser) { - IdentitySessionFactoryDescriptor descriptor = new IdentitySessionFactoryDescriptor(); - - if (element.hasAttribute("jndi")) { - descriptor.setJndiName(element.getAttribute("jndi")); - - } else if (element.hasAttribute("resource")) { - descriptor.setResource(element.getAttribute("resource")); - } - - return descriptor; - } - -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JbossIdmIdentitySessionFactoryBinding.java (from rev 4562, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionFactoryBinding.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JbossIdmIdentitySessionFactoryBinding.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JbossIdmIdentitySessionFactoryBinding.java 2009-04-16 11:50:42 UTC (rev 4564) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.wire.binding; + +import org.jbpm.pvm.internal.wire.descriptor.JbossIdmIdentitySessionFactoryDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + + +/** + * @author Tom Baeyens + */ +public class JbossIdmIdentitySessionFactoryBinding extends WireDescriptorBinding { + + public JbossIdmIdentitySessionFactoryBinding() { + super("jboss-idm-identity-session-factory"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + JbossIdmIdentitySessionFactoryDescriptor descriptor = new JbossIdmIdentitySessionFactoryDescriptor(); + + if (element.hasAttribute("jndi")) { + descriptor.setJndiName(element.getAttribute("jndi")); + + } else if (element.hasAttribute("resource")) { + descriptor.setResource(element.getAttribute("resource")); + } + + return descriptor; + } + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JbossIdmIdentitySessionFactoryBinding.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionFactoryDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionFactoryDescriptor.java 2009-04-16 10:55:45 UTC (rev 4563) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionFactoryDescriptor.java 2009-04-16 11:50:42 UTC (rev 4564) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.wire.descriptor; - -import javax.naming.InitialContext; - -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.impl.api.IdentitySessionFactoryImpl; -import org.jbpm.JbpmException; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireDefinition; - - -/** - * @author Tom Baeyens - */ -public class IdentitySessionFactoryDescriptor extends AbstractDescriptor { - - private static final long serialVersionUID = 1L; - - protected String resource = "jbpm.identity.cfg.xml"; - protected String jndiName = null; - - public Object construct(WireContext wireContext) { - if (jndiName!=null) { - try { - InitialContext initialContext = new InitialContext(); - IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) initialContext.lookup(jndiName); - return identitySessionFactory; - } catch (Exception e) { - throw new JbpmException("couldn't get idm session factory from jndi address "+jndiName, e); - } - } - - try { - return new IdentitySessionFactoryImpl(resource); - } catch (Exception e) { - throw new JbpmException("couldn't instanatiate identity session factory: "+e.getMessage(), e); - } - } - - public Class< ? > getType(WireDefinition wireDefinition) { - return IdentitySessionFactory.class; - } - - public void setResource(String resource) { - this.resource = resource; - } - public void setJndiName(String jndiName) { - this.jndiName = jndiName; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java (from rev 4563, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionFactoryDescriptor.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java 2009-04-16 11:50:42 UTC (rev 4564) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.wire.descriptor; + +import javax.naming.InitialContext; + +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.identity.idm.impl.api.IdentitySessionFactoryImpl; +import org.jbpm.JbpmException; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; + + +/** + * @author Tom Baeyens + */ +public class JbossIdmIdentitySessionFactoryDescriptor extends AbstractDescriptor { + + private static final long serialVersionUID = 1L; + + protected String resource = "jbpm.identity.cfg.xml"; + protected String jndiName = null; + + public Object construct(WireContext wireContext) { + if (jndiName!=null) { + try { + InitialContext initialContext = new InitialContext(); + IdentitySessionFactory identitySessionFactory = (IdentitySessionFactory) initialContext.lookup(jndiName); + return identitySessionFactory; + } catch (Exception e) { + throw new JbpmException("couldn't get idm session factory from jndi address "+jndiName, e); + } + } + + try { + return new IdentitySessionFactoryImpl(resource); + } catch (Exception e) { + throw new JbpmException("couldn't instanatiate identity session factory: "+e.getMessage(), e); + } + } + + public Class< ? > getType(WireDefinition wireDefinition) { + return IdentitySessionFactory.class; + } + + public void setResource(String resource) { + this.resource = resource; + } + public void setJndiName(String jndiName) { + this.jndiName = jndiName; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionFactoryDescriptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 10:55:45 UTC (rev 4563) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 11:50:42 UTC (rev 4564) @@ -49,7 +49,8 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> <!-- db sessions --> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 10:55:45 UTC (rev 4563) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-04-16 11:50:42 UTC (rev 4564) @@ -49,7 +49,8 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> <!-- db sessions -->