Author: jeff.yuchang Date: 2009-11-19 08:24:34 -0500 (Thu, 19 Nov 2009) New Revision: 1037 Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java Removed: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml migration/idm/trunk/integration/deployer/src/main/resources/deployer-assembly.xml migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml Log: * update on the identity-deployer.xsd. Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMConfigParsingDeployer.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -7,8 +7,8 @@ import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType; import org.jboss.virtual.VirtualFile; +import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType; /** * IDMConfigParsingDeployer is picking up the *-jboss-idm.xml files, produce the {@link IDMMetadata} Object, which will be used in the @@ -32,7 +32,7 @@ IDMMetadata metaData = new IDMMetadata(); metaData.setDeployerFileName(file.getPathName()); - JbossIDMDeployerType deployerMetadata = JAXB2IdentityDeployerConfiguration.createDeployerConfiguration(file.openStream()); + PicketlinkIDMDeployerType deployerMetadata = JAXB2IdentityDeployerConfiguration.createDeployerConfiguration(file.openStream()); metaData.setDeploperType(deployerMetadata); logger.fine("the configuration file path name is: [" + file.getPathName() + "]"); Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMDeployer.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -9,7 +9,7 @@ import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.picketlink.idm.integration.jboss5.jaxb2.InitializerType; -import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType; +import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType; /** @@ -34,7 +34,7 @@ @Override public void deploy(VFSDeploymentUnit deploymentUnit, IDMMetadata metadata) throws DeploymentException { - JbossIDMDeployerType config = metadata.getDeploperType(); + PicketlinkIDMDeployerType config = metadata.getDeploperType(); service = new IDMService(config.getIdmConfigFile()); if (transactionManager != null) { service.setTransactionManager(transactionManager); Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/IDMMetadata.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -3,10 +3,10 @@ */ package org.picketlink.idm.integration.jboss5; +import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType; + import java.io.Serializable; -import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType; - /** * * @@ -17,15 +17,15 @@ private static final long serialVersionUID = -3236524660920273677L; - private JbossIDMDeployerType deployerType; + private PicketlinkIDMDeployerType deployerType; private String deployerFileName; - public JbossIDMDeployerType getDeploperType() { + public PicketlinkIDMDeployerType getDeploperType() { return deployerType; } - public void setDeploperType(JbossIDMDeployerType deployerType) { + public void setDeploperType(PicketlinkIDMDeployerType deployerType) { this.deployerType = deployerType; } Modified: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/JAXB2IdentityDeployerConfiguration.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -16,7 +16,7 @@ import org.picketlink.idm.common.exception.IdentityConfigurationException; import org.picketlink.idm.impl.helper.SecurityActions; -import org.picketlink.idm.integration.jboss5.jaxb2.JbossIDMDeployerType; +import org.picketlink.idm.integration.jboss5.jaxb2.PicketlinkIDMDeployerType; /** * @author Jeff Yu @@ -27,17 +27,17 @@ private static final Logger logger = Logger.getLogger(JAXB2IdentityDeployerConfiguration.class.getName()); @SuppressWarnings({"unchecked"}) - public static JbossIDMDeployerType createDeployerConfiguration(InputStream inputStream) throws Exception { + public static PicketlinkIDMDeployerType createDeployerConfiguration(InputStream inputStream) throws Exception { if (inputStream == null) { throw new NullPointerException("deployer configuration is null"); } - JAXBElement<JbossIDMDeployerType> deployerType = null; + JAXBElement<PicketlinkIDMDeployerType> deployerType = null; try { JAXBContext jaxbContext = JAXBContext.newInstance("org.picketlink.idm.integration.jboss5.jaxb2"); Unmarshaller unMarshaller = jaxbContext.createUnmarshaller(); - deployerType = (JAXBElement<JbossIDMDeployerType>)unMarshaller.unmarshal(inputStream); + deployerType = (JAXBElement<PicketlinkIDMDeployerType>)unMarshaller.unmarshal(inputStream); }catch (JAXBException e) { logger.severe(e.getMessage()); @@ -51,7 +51,7 @@ } - public static JbossIDMDeployerType createDeployerConfiguration(File file) throws Exception { + public static PicketlinkIDMDeployerType createDeployerConfiguration(File file) throws Exception { if (file == null) { throw new NullPointerException("Identity deployer file is null"); @@ -69,7 +69,7 @@ } - public static JbossIDMDeployerType createDeployerConfiguration(String file) throws Exception { + public static PicketlinkIDMDeployerType createDeployerConfiguration(String file) throws Exception { ClassLoader classLoader = SecurityActions.getContextClassLoader(); InputStream inputStream = classLoader.getResourceAsStream(file); if (inputStream == null) Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateDeployerType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,125 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for hibernateDeployerType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="hibernateDeployerType"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="hibernateConfiguration" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;choice> - * &lt;element name="hibernateSessionFactoryRegistryName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="hibernateSessionFactoryJNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;/choice> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "hibernateDeployerType", propOrder = { - "hibernateConfiguration", - "hibernateSessionFactoryRegistryName", - "hibernateSessionFactoryJNDIName" -}) -public class HibernateDeployerType { - - @XmlElement(required = true) - protected String hibernateConfiguration; - protected String hibernateSessionFactoryRegistryName; - protected String hibernateSessionFactoryJNDIName; - - /** - * Gets the value of the hibernateConfiguration property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHibernateConfiguration() { - return hibernateConfiguration; - } - - /** - * Sets the value of the hibernateConfiguration property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHibernateConfiguration(String value) { - this.hibernateConfiguration = value; - } - - /** - * Gets the value of the hibernateSessionFactoryRegistryName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHibernateSessionFactoryRegistryName() { - return hibernateSessionFactoryRegistryName; - } - - /** - * Sets the value of the hibernateSessionFactoryRegistryName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHibernateSessionFactoryRegistryName(String value) { - this.hibernateSessionFactoryRegistryName = value; - } - - /** - * Gets the value of the hibernateSessionFactoryJNDIName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHibernateSessionFactoryJNDIName() { - return hibernateSessionFactoryJNDIName; - } - - /** - * Sets the value of the hibernateSessionFactoryJNDIName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHibernateSessionFactoryJNDIName(String value) { - this.hibernateSessionFactoryJNDIName = value; - } - -} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/HibernateInitializerType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,88 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for hibernateInitializerType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="hibernateInitializerType"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="doChecking" type="{http://www.w3.org/2001/XMLSchema}boolean"/> - * &lt;element name="setupLocation" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "hibernateInitializerType", propOrder = { - "doChecking", - "setupLocation" -}) -public class HibernateInitializerType { - - protected boolean doChecking; - @XmlElement(required = true) - protected String setupLocation; - - /** - * Gets the value of the doChecking property. - * - */ - public boolean isDoChecking() { - return doChecking; - } - - /** - * Sets the value of the doChecking property. - * - */ - public void setDoChecking(boolean value) { - this.doChecking = value; - } - - /** - * Gets the value of the setupLocation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSetupLocation() { - return setupLocation; - } - - /** - * Sets the value of the setupLocation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSetupLocation(String value) { - this.setupLocation = value; - } - -} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/InitializerType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,125 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for initializerType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="initializerType"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="datasource" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;choice> - * &lt;element name="sqlInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}sqlInitializerType"/> - * &lt;element name="hibernateInitializer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}hibernateInitializerType"/> - * &lt;/choice> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "initializerType", propOrder = { - "datasource", - "sqlInitializer", - "hibernateInitializer" -}) -public class InitializerType { - - @XmlElement(required = true) - protected String datasource; - protected SqlInitializerType sqlInitializer; - protected HibernateInitializerType hibernateInitializer; - - /** - * Gets the value of the datasource property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDatasource() { - return datasource; - } - - /** - * Sets the value of the datasource property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDatasource(String value) { - this.datasource = value; - } - - /** - * Gets the value of the sqlInitializer property. - * - * @return - * possible object is - * {@link SqlInitializerType } - * - */ - public SqlInitializerType getSqlInitializer() { - return sqlInitializer; - } - - /** - * Sets the value of the sqlInitializer property. - * - * @param value - * allowed object is - * {@link SqlInitializerType } - * - */ - public void setSqlInitializer(SqlInitializerType value) { - this.sqlInitializer = value; - } - - /** - * Gets the value of the hibernateInitializer property. - * - * @return - * possible object is - * {@link HibernateInitializerType } - * - */ - public HibernateInitializerType getHibernateInitializer() { - return hibernateInitializer; - } - - /** - * Sets the value of the hibernateInitializer property. - * - * @param value - * allowed object is - * {@link HibernateInitializerType } - * - */ - public void setHibernateInitializer(HibernateInitializerType value) { - this.hibernateInitializer = value; - } - -} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/JbossIDMDeployerType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,212 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for jbossIDMDeployerType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="jbossIDMDeployerType"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="JNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="idmConfigFile" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="hibernateDeployer" type="{urn:jboss:identity:idm:deployer:v1_0_beta}hibernateDeployerType" minOccurs="0"/> - * &lt;element name="initializers" type="{urn:jboss:identity:idm:deployer:v1_0_beta}initializerType" minOccurs="0"/> - * &lt;element name="options" type="{urn:jboss:identity:idm:deployer:v1_0_beta}optionsType" minOccurs="0"/> - * &lt;element name="depends" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "jbossIDMDeployerType", propOrder = { - "jndiName", - "idmConfigFile", - "hibernateDeployer", - "initializers", - "options", - "depends" -}) -public class JbossIDMDeployerType { - - @XmlElement(name = "JNDIName", required = true) - protected String jndiName; - @XmlElement(required = true) - protected String idmConfigFile; - protected HibernateDeployerType hibernateDeployer; - protected InitializerType initializers; - protected OptionsType options; - protected List<String> depends; - - /** - * Gets the value of the jndiName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getJNDIName() { - return jndiName; - } - - /** - * Sets the value of the jndiName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setJNDIName(String value) { - this.jndiName = value; - } - - /** - * Gets the value of the idmConfigFile property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIdmConfigFile() { - return idmConfigFile; - } - - /** - * Sets the value of the idmConfigFile property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIdmConfigFile(String value) { - this.idmConfigFile = value; - } - - /** - * Gets the value of the hibernateDeployer property. - * - * @return - * possible object is - * {@link HibernateDeployerType } - * - */ - public HibernateDeployerType getHibernateDeployer() { - return hibernateDeployer; - } - - /** - * Sets the value of the hibernateDeployer property. - * - * @param value - * allowed object is - * {@link HibernateDeployerType } - * - */ - public void setHibernateDeployer(HibernateDeployerType value) { - this.hibernateDeployer = value; - } - - /** - * Gets the value of the initializers property. - * - * @return - * possible object is - * {@link InitializerType } - * - */ - public InitializerType getInitializers() { - return initializers; - } - - /** - * Sets the value of the initializers property. - * - * @param value - * allowed object is - * {@link InitializerType } - * - */ - public void setInitializers(InitializerType value) { - this.initializers = value; - } - - /** - * Gets the value of the options property. - * - * @return - * possible object is - * {@link OptionsType } - * - */ - public OptionsType getOptions() { - return options; - } - - /** - * Sets the value of the options property. - * - * @param value - * allowed object is - * {@link OptionsType } - * - */ - public void setOptions(OptionsType value) { - this.options = value; - } - - /** - * Gets the value of the depends property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the depends property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getDepends().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List<String> getDepends() { - if (depends == null) { - depends = new ArrayList<String>(); - } - return this.depends; - } - -} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/ObjectFactory.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,108 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.picketlink.idm.integration.jboss5.jaxb2 package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _JbossIdmDeployer_QNAME = new QName("urn:org:picketlink:idm:deployer:v1_0_CR1", "picketlink-idm-deployer"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.picketlink.idm.integration.jboss5.jaxb2 - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link OptionType } - * - */ - public OptionType createOptionType() { - return new OptionType(); - } - - /** - * Create an instance of {@link OptionsType } - * - */ - public OptionsType createOptionsType() { - return new OptionsType(); - } - - /** - * Create an instance of {@link JbossIDMDeployerType } - * - */ - public JbossIDMDeployerType createJbossIDMDeployerType() { - return new JbossIDMDeployerType(); - } - - /** - * Create an instance of {@link InitializerType } - * - */ - public InitializerType createInitializerType() { - return new InitializerType(); - } - - /** - * Create an instance of {@link HibernateDeployerType } - * - */ - public HibernateDeployerType createHibernateDeployerType() { - return new HibernateDeployerType(); - } - - /** - * Create an instance of {@link SqlInitializerType } - * - */ - public SqlInitializerType createSqlInitializerType() { - return new SqlInitializerType(); - } - - /** - * Create an instance of {@link HibernateInitializerType } - * - */ - public HibernateInitializerType createHibernateInitializerType() { - return new HibernateInitializerType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link JbossIDMDeployerType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:jboss:identity:idm:deployer:v1_0_beta", name = "jboss-idm-deployer") - public JAXBElement<JbossIDMDeployerType> createJbossIdmDeployer(JbossIDMDeployerType value) { - return new JAXBElement<JbossIDMDeployerType>(_JbossIdmDeployer_QNAME, JbossIDMDeployerType.class, null, value); - } - -} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,97 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for optionType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="optionType"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "optionType", propOrder = { - "name", - "value" -}) -public class OptionType { - - @XmlElement(required = true) - protected String name; - @XmlElement(required = true) - protected String value; - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - -} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/OptionsType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,76 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for optionsType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="optionsType"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="option" type="{urn:jboss:identity:idm:deployer:v1_0_beta}optionType" maxOccurs="unbounded"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "optionsType", propOrder = { - "option" -}) -public class OptionsType { - - @XmlElement(required = true) - protected List<OptionType> option; - - /** - * Gets the value of the option property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the option property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getOption().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link OptionType } - * - * - */ - public List<OptionType> getOption() { - if (option == null) { - option = new ArrayList<OptionType>(); - } - return this.option; - } - -} Added: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java (rev 0) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/PicketlinkIDMDeployerType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -0,0 +1,212 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.11.19 at 09:03:04 PM CST +// + + +package org.picketlink.idm.integration.jboss5.jaxb2; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for picketlinkIDMDeployerType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="picketlinkIDMDeployerType"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="JNDIName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="idmConfigFile" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="hibernateDeployer" type="{urn:picketlink:idm:deployer:v1_0}hibernateDeployerType" minOccurs="0"/> + * &lt;element name="initializers" type="{urn:picketlink:idm:deployer:v1_0}initializerType" minOccurs="0"/> + * &lt;element name="options" type="{urn:picketlink:idm:deployer:v1_0}optionsType" minOccurs="0"/> + * &lt;element name="depends" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "picketlinkIDMDeployerType", propOrder = { + "jndiName", + "idmConfigFile", + "hibernateDeployer", + "initializers", + "options", + "depends" +}) +public class PicketlinkIDMDeployerType { + + @XmlElement(name = "JNDIName", required = true) + protected String jndiName; + @XmlElement(required = true) + protected String idmConfigFile; + protected HibernateDeployerType hibernateDeployer; + protected InitializerType initializers; + protected OptionsType options; + protected List<String> depends; + + /** + * Gets the value of the jndiName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getJNDIName() { + return jndiName; + } + + /** + * Sets the value of the jndiName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setJNDIName(String value) { + this.jndiName = value; + } + + /** + * Gets the value of the idmConfigFile property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdmConfigFile() { + return idmConfigFile; + } + + /** + * Sets the value of the idmConfigFile property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdmConfigFile(String value) { + this.idmConfigFile = value; + } + + /** + * Gets the value of the hibernateDeployer property. + * + * @return + * possible object is + * {@link HibernateDeployerType } + * + */ + public HibernateDeployerType getHibernateDeployer() { + return hibernateDeployer; + } + + /** + * Sets the value of the hibernateDeployer property. + * + * @param value + * allowed object is + * {@link HibernateDeployerType } + * + */ + public void setHibernateDeployer(HibernateDeployerType value) { + this.hibernateDeployer = value; + } + + /** + * Gets the value of the initializers property. + * + * @return + * possible object is + * {@link InitializerType } + * + */ + public InitializerType getInitializers() { + return initializers; + } + + /** + * Sets the value of the initializers property. + * + * @param value + * allowed object is + * {@link InitializerType } + * + */ + public void setInitializers(InitializerType value) { + this.initializers = value; + } + + /** + * Gets the value of the options property. + * + * @return + * possible object is + * {@link OptionsType } + * + */ + public OptionsType getOptions() { + return options; + } + + /** + * Sets the value of the options property. + * + * @param value + * allowed object is + * {@link OptionsType } + * + */ + public void setOptions(OptionsType value) { + this.options = value; + } + + /** + * Gets the value of the depends property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the depends property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getDepends().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List<String> getDepends() { + if (depends == null) { + depends = new ArrayList<String>(); + } + return this.depends; + } + +} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/SqlInitializerType.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,97 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - - -package org.picketlink.idm.integration.jboss5.jaxb2; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for sqlInitializerType complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="sqlInitializerType"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="sqlFile" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;element name="exitSQL" type="{http://www.w3.org/2001/XMLSchema}string"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "sqlInitializerType", propOrder = { - "sqlFile", - "exitSQL" -}) -public class SqlInitializerType { - - @XmlElement(required = true) - protected String sqlFile; - @XmlElement(required = true) - protected String exitSQL; - - /** - * Gets the value of the sqlFile property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSqlFile() { - return sqlFile; - } - - /** - * Sets the value of the sqlFile property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSqlFile(String value) { - this.sqlFile = value; - } - - /** - * Gets the value of the exitSQL property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getExitSQL() { - return exitSQL; - } - - /** - * Sets the value of the exitSQL property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setExitSQL(String value) { - this.exitSQL = value; - } - -} Deleted: migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java =================================================================== --- migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/java/org/picketlink/idm/integration/jboss5/jaxb2/package-info.java 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-619 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.05.28 at 11:27:34 PM CST -// - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:org:picketlink:idm:deployer:v1_0_CR1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.picketlink.idm.integration.jboss5.jaxb2; Modified: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/default-picketlink-idm.xml 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" +<picketlink-idm-deployer xmlns="urn:picketlink:idm:deployer:v1_0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> + xsi:schemaLocation="urn:picketlink:idm:deployer:v1_0 identity-deployer.xsd"> <JNDIName>java:/IdentitySessionFactory</JNDIName> <idmConfigFile>picketlink.idm.cfg.xml</idmConfigFile> <hibernateDeployer> @@ -18,4 +18,4 @@ <doChecking>true</doChecking> </hibernateInitializer--> </initializers> -</jboss-idm-deployer> +</picketlink-idm-deployer> Modified: migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/resources/META-INF/picketlink-idm-deployer-jboss-beans.xml 2009-11-19 13:24:34 UTC (rev 1037) @@ -8,7 +8,7 @@ <bean name="org.picketlink.idm:service=MetaDataDeployer" class="org.picketlink.idm.integration.jboss5.IDMConfigParsingDeployer"> - <property name="suffix">-jboss-idm.xml</property> + <property name="suffix">-picketlink-idm.xml</property> <property name="allowMultipleFiles">true</property> </bean> Modified: migration/idm/trunk/integration/deployer/src/main/resources/deployer-assembly.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/deployer-assembly.xml 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/resources/deployer-assembly.xml 2009-11-19 13:24:34 UTC (rev 1037) @@ -10,7 +10,7 @@ <directory>${project.build.outputDirectory}</directory> <outputDirectory>/</outputDirectory> <includes> - <include>META-INF/idm-deployer-jboss-beans.xml</include> + <include>META-INF/picketlink-idm-deployer-jboss-beans.xml</include> <include>identity-deployer.xsd</include> </includes> </fileSet> @@ -20,16 +20,16 @@ <dependencySet> <outputDirectory>/</outputDirectory> <includes> - <include>org.picketlink.idm.integration:idm-jboss5-deployer</include> - <include>org.picketlink.idm.integration:idm-jboss5</include> - <include>org.picketlink.idm:idm-ldap</include> - <include>org.picketlink.idm:idm-hibernate</include> - <include>org.picketlink.idm:idm-core</include> - <include>org.picketlink.idm:idm-api</include> - <include>org.picketlink.idm:idm-common</include> - <include>org.picketlink.idm:idm-spi</include> - <include>org.picketlink.idm:idm-auth</include> - <include>org.picketlink.idm:idm-cache</include> + <include>org.picketlink.idm.integration:picketlink-idm-jboss5-deployer</include> + <include>org.picketlink.idm.integration:picketlink-idm-jboss5</include> + <include>org.picketlink.idm:picketlink-idm-ldap</include> + <include>org.picketlink.idm:picketlink-idm-hibernate</include> + <include>org.picketlink.idm:picketlink-idm-core</include> + <include>org.picketlink.idm:picketlink-idm-api</include> + <include>org.picketlink.idm:picketlink-idm-common</include> + <include>org.picketlink.idm:picketlink-idm-spi</include> + <include>org.picketlink.idm:picketlink-idm-auth</include> + <include>org.picketlink.idm:picketlink-idm-cache</include> </includes> </dependencySet> </dependencySets> Modified: migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd =================================================================== --- migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/main/resources/identity-deployer.xsd 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:org:picketlink:idm:deployer:v1_0_CR1" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="picketlink-idm-deployer" type="urn:picketlinkIDMDeployerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"> +<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:picketlink:idm:deployer:v1_0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:element name="picketlink-idm-deployer" type="urn:picketlinkIDMDeployerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0"> <xs:annotation> - <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... + <xs:documentation>&lt;xs:schemaattributeFormDefault="unqualifi... </xs:annotation> </xs:element> @@ -10,9 +10,9 @@ <xs:sequence> <xs:element name="JNDIName" type="xs:string" /> <xs:element name="idmConfigFile" type="xs:string" /> - <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/> - <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/> - <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1"/> + <xs:element name="hibernateDeployer" minOccurs="0" type="urn:hibernateDeployerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0"/> + <xs:element name="initializers" minOccurs="0" type="urn:initializerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0"/> + <xs:element name="options" minOccurs="0" type="urn:optionsType" xmlns:urn="urn:picketlink:idm:deployer:v1_0"/> <xs:element name="depends" type="xs:string" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> @@ -21,8 +21,8 @@ <xs:sequence> <xs:element name="datasource" type="xs:string" /> <xs:choice> - <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" /> - <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" /> + <xs:element name="sqlInitializer" type="urn:sqlInitializerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0" /> + <xs:element name="hibernateInitializer" type="urn:hibernateInitializerType" xmlns:urn="urn:picketlink:idm:deployer:v1_0" /> </xs:choice> </xs:sequence> </xs:complexType> @@ -43,7 +43,7 @@ <xs:complexType name="optionsType"> <xs:sequence> - <xs:element name="option" type="urn:optionType" xmlns:urn="urn:org:picketlink:idm:deployer:v1_0_CR1" maxOccurs="unbounded" /> + <xs:element name="option" type="urn:optionType" xmlns:urn="urn:picketlink:idm:deployer:v1_0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> Modified: migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml =================================================================== --- migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/deployer/src/test/resources/jbpm.identity/META-INF/jbpm-picketlink-idm.xml 2009-11-19 13:24:34 UTC (rev 1037) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jboss-idm-deployer xmlns="urn:jboss:identity:idm:deployer:v1_0_beta" +<picketlink-idm-deployer xmlns="urn:picketlink:idm:deployer:v1_0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:deployer:v1_0_beta identity-deployer.xsd"> + xsi:schemaLocation="urn:picketlink:idm:deployer:v1_0 identity-deployer.xsd"> <JNDIName>java:/jbpmIdentitySessionFactory</JNDIName> - <idmConfigFile>jbpm.idm.cfg.xml</idmConfigFile> -</jboss-idm-deployer> + <idmConfigFile>jbpm.picketlink.idm.cfg.xml</idmConfigFile> +</picketlink-idm-deployer> Modified: migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml =================================================================== --- migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml 2009-11-19 12:17:30 UTC (rev 1036) +++ migration/idm/trunk/integration/jboss5/src/main/resources/META-INF/picketlink-idm-service-jboss-beans.xml 2009-11-19 13:24:34 UTC (rev 1037) @@ -12,9 +12,9 @@ </constructor> <property name="idmSessionFactoryJNDI">java:/IdentitySessionFactory</property> <property name="SQLScript">idm-sql/picketlink.idm.hsql.create.sql</property> - <property name="datasource">java:idmDS</property> + <property name="datasource">java:PicketLinkIDMDS</property> <property name="exitSQL">select * from jbid_io</property> - <depends>jboss.jca:service=DataSourceBinding,name=jbossidmDS</depends> + <depends>jboss.jca:service=DataSourceBinding,name=PicketLinkIDMDS</depends> </bean> </deployment> \ No newline at end of file