Author: bdaw Date: 2009-10-07 07:53:31 -0400 (Wed, 07 Oct 2009) New Revision: 821 Added: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/cache/ Removed: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java Modified: idm/trunk/assembly/pom.xml idm/trunk/example/auth-simple/pom.xml idm/trunk/example/auth/pom.xml idm/trunk/example/simple/pom.xml idm/trunk/idm-api/pom.xml idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEvent.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventBroadcaster.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventEmitter.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventListener.java idm/trunk/idm-auth/pom.xml idm/trunk/idm-cache/pom.xml idm/trunk/idm-common/pom.xml idm/trunk/idm-core/pom.xml idm/trunk/idm-hibernate/pom.xml idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm-ldap/pom.xml idm/trunk/idm-spi/pom.xml idm/trunk/idm-testsuite/pom.xml idm/trunk/idm-testsuite/src/test/resources/log4j.xml idm/trunk/integration/deployer/pom.xml idm/trunk/integration/jboss5/pom.xml idm/trunk/integration/pom.xml idm/trunk/parent/pom.xml idm/trunk/pom.xml Log: - fix hibernate db schema naming - small perf improvement in hibernate store Modified: idm/trunk/assembly/pom.xml =================================================================== --- idm/trunk/assembly/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/assembly/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -4,14 +4,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.identity.idm</groupId> <artifactId>jbossidm</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss Identity IDM Assembly </name> <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> Modified: idm/trunk/example/auth/pom.xml =================================================================== --- idm/trunk/example/auth/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/example/auth/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.identity.idm.example</groupId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/trunk/example/auth-simple/pom.xml =================================================================== --- idm/trunk/example/auth-simple/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/example/auth-simple/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.identity.idm.example</groupId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/trunk/example/simple/pom.xml =================================================================== --- idm/trunk/example/simple/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/example/simple/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.identity.idm.example</groupId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple JBoss Identity IDM Maven2 project</name> Modified: idm/trunk/idm-api/pom.xml =================================================================== --- idm/trunk/idm-api/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-api/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEvent.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEvent.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEvent.java 2009-10-07 11:53:31 UTC (rev 821) @@ -1,31 +1,31 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; - -/** - * @author boleslaw dot dawidowicz at redhat anotherdot com - * @version : 0.1 $ - */ -public class IdentityEvent -{ -} \ No newline at end of file +///* +//* JBoss, a division of Red Hat +//* Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; +// +///** +// * @author boleslaw dot dawidowicz at redhat anotherdot com +// * @version : 0.1 $ +// */ +//public class IdentityEvent +//{ +//} \ No newline at end of file Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventBroadcaster.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventBroadcaster.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventBroadcaster.java 2009-10-07 11:53:31 UTC (rev 821) @@ -1,41 +1,41 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; - -import org.jboss.identity.idm.api.event.IdentityEvent; - -/** - * Interface that allow event firing. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface IdentityEventBroadcaster -{ - /** - * Fire an event. - * - * @param event the event to fire - */ - void fireEvent(IdentityEvent event); -} \ No newline at end of file +///****************************************************************************** +// * JBoss, a division of Red Hat * +// * Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; +// +//import org.jboss.identity.idm.api.event.IdentityEvent; +// +///** +// * Interface that allow event firing. +// * +// * @author <a href="mailto:julien@jboss.org">Julien Viet</a> +// * @version $Revision: 1.1 $ +// */ +//public interface IdentityEventBroadcaster +//{ +// /** +// * Fire an event. +// * +// * @param event the event to fire +// */ +// void fireEvent(IdentityEvent event); +//} \ No newline at end of file Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventEmitter.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventEmitter.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventEmitter.java 2009-10-07 11:53:31 UTC (rev 821) @@ -1,48 +1,48 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; - -import org.jboss.identity.idm.api.event.IdentityEventListener; - -/** - * Interface that allows registration management of identity event listeners. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface IdentityEventEmitter -{ - /** - * Add a listener. - * - * @param listener the listener for all identity events - */ - void addListener(IdentityEventListener listener); - - /** - * Remove a listener. - * - * @param listener the listener - */ - void removeListener(IdentityEventListener listener); -} \ No newline at end of file +///****************************************************************************** +// * JBoss, a division of Red Hat * +// * Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; +// +//import org.jboss.identity.idm.api.event.IdentityEventListener; +// +///** +// * Interface that allows registration management of identity event listeners. +// * +// * @author <a href="mailto:julien@jboss.org">Julien Viet</a> +// * @version $Revision: 1.1 $ +// */ +//public interface IdentityEventEmitter +//{ +// /** +// * Add a listener. +// * +// * @param listener the listener for all identity events +// */ +// void addListener(IdentityEventListener listener); +// +// /** +// * Remove a listener. +// * +// * @param listener the listener +// */ +// void removeListener(IdentityEventListener listener); +//} \ No newline at end of file Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventListener.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventListener.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/event/IdentityEventListener.java 2009-10-07 11:53:31 UTC (rev 821) @@ -1,41 +1,41 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; - -import org.jboss.identity.idm.api.event.IdentityEvent; - -/** - * An event listener. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface IdentityEventListener -{ - /** - * Fire event on the listener. - * - * @param event the identity event - */ - void onEvent(IdentityEvent event); -} \ No newline at end of file +///****************************************************************************** +// * JBoss, a division of Red Hat * +// * Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.api.event; +// +//import org.jboss.identity.idm.api.event.IdentityEvent; +// +///** +// * An event listener. +// * +// * @author <a href="mailto:julien@jboss.org">Julien Viet</a> +// * @version $Revision: 1.1 $ +// */ +//public interface IdentityEventListener +//{ +// /** +// * Fire event on the listener. +// * +// * @param event the identity event +// */ +// void onEvent(IdentityEvent event); +//} \ No newline at end of file Modified: idm/trunk/idm-auth/pom.xml =================================================================== --- idm/trunk/idm-auth/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-auth/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-cache/pom.xml =================================================================== --- idm/trunk/idm-cache/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-cache/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-common/pom.xml =================================================================== --- idm/trunk/idm-common/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-common/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-core/pom.xml =================================================================== --- idm/trunk/idm-core/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-core/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-hibernate/pom.xml =================================================================== --- idm/trunk/idm-hibernate/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-10-07 11:53:31 UTC (rev 821) @@ -22,29 +22,30 @@ package org.jboss.identity.idm.impl.model.hibernate; +import org.jboss.identity.idm.common.exception.PolicyValidationException; +import org.jboss.identity.idm.spi.model.IdentityObject; +import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.HashMap; -import java.util.Collections; -import java.util.Collection; +import javax.persistence.CascadeType; import javax.persistence.Column; -import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.persistence.FetchType; import javax.persistence.UniqueConstraint; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import org.jboss.identity.idm.common.exception.PolicyValidationException; -import org.jboss.identity.idm.spi.model.IdentityObject; -import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CollectionOfElements; @@ -76,6 +77,7 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; @Column(name = "NAME", nullable = false) @@ -100,7 +102,7 @@ @CollectionOfElements @JoinTable(name = "identity_obj_properties", joinColumns = @JoinColumn(name = "IDENTITY_OBJ_ID", nullable=false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "prop_key", nullable=false)) + @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) @Column(name = "PROPERTY") private Map<String, String> properties = new HashMap<String, String>(); Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java 2009-10-07 11:53:31 UTC (rev 821) @@ -22,19 +22,15 @@ package org.jboss.identity.idm.impl.model.hibernate; -import org.hibernate.annotations.CollectionOfElements; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.CascadeType; import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Column; -import javax.persistence.JoinColumn; import javax.persistence.FetchType; -import javax.persistence.CascadeType; -import java.util.Set; -import java.util.HashSet; -import java.util.Collections; +import javax.persistence.OneToMany; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.Table; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttributeValue.java 2009-10-07 11:53:31 UTC (rev 821) @@ -22,20 +22,12 @@ package org.jboss.identity.idm.impl.model.hibernate; -import org.hibernate.annotations.CollectionOfElements; - -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.OneToMany; import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.Id; +import javax.persistence.Entity; import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.Lob; -import java.util.Set; -import java.util.HashSet; -import java.util.Collections; +import javax.persistence.Table; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> @@ -50,10 +42,11 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; @Lob - @Column(length = 10240000) + @Column(length = 10240000, name="VALUE") private byte[] value; public HibernateIdentityObjectBinaryAttributeValue() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-10-07 11:53:31 UTC (rev 821) @@ -23,23 +23,24 @@ package org.jboss.identity.idm.impl.model.hibernate; import org.jboss.identity.idm.spi.model.IdentityObjectCredential; -import org.hibernate.annotations.CollectionOfElements; -import org.hibernate.annotations.Type; +import java.util.HashMap; +import java.util.Map; + +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Column; -import javax.persistence.FetchType; import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.Lob; import javax.persistence.ManyToOne; -import javax.persistence.JoinTable; +import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import javax.persistence.Lob; -import java.util.Map; -import java.util.HashMap; +import org.hibernate.annotations.CollectionOfElements; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ @@ -55,6 +56,7 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; @ManyToOne(fetch = FetchType.EAGER) @@ -74,7 +76,7 @@ @CollectionOfElements @JoinTable(name = "jbid_io_creden_props", joinColumns = @JoinColumn(name = "CREDENTIAL_ID", nullable = false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "prop_key", nullable=false)) + @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) @Column(name = "PROPERTY") private Map<String, String> properties = new HashMap<String, String>(); Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java 2009-10-07 11:53:31 UTC (rev 821) @@ -41,6 +41,7 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; @Column(name = "NAME", unique = true) Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-10-07 11:53:31 UTC (rev 821) @@ -22,34 +22,31 @@ package org.jboss.identity.idm.impl.model.hibernate; +import org.jboss.identity.idm.spi.model.IdentityObjectRelationship; +import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; + +import java.util.HashMap; +import java.util.Map; + +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.JoinColumn; import javax.persistence.UniqueConstraint; -import javax.persistence.FetchType; -import javax.persistence.JoinTable; -import javax.persistence.Column; -import org.jboss.identity.idm.spi.model.IdentityObjectRelationship; -import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; import org.hibernate.annotations.CollectionOfElements; -import java.util.Map; -import java.util.HashMap; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ @Entity -@Table(name="jbid_io_rel", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "TYPE", "FROM_IDENTITY", "TO_IDENTITY"})}) +@Table(name="jbid_io_rel", uniqueConstraints = {@UniqueConstraint(columnNames = {"NAME", "REL_TYPE", "FROM_IDENTITY", "TO_IDENTITY"})}) public class HibernateIdentityObjectRelationship implements IdentityObjectRelationship { public static final String findIdentityObjectRelationshipsByType = @@ -61,6 +58,7 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; @ManyToOne @@ -68,7 +66,7 @@ private HibernateIdentityObjectRelationshipName name; @ManyToOne - @JoinColumn(nullable = false, name="TYPE") + @JoinColumn(nullable = false, name="REL_TYPE") private HibernateIdentityObjectRelationshipType type; @ManyToOne(fetch = FetchType.EAGER) @@ -81,7 +79,7 @@ @CollectionOfElements @JoinTable(name = "jbid_io_rel_props", joinColumns = @JoinColumn(name = "REALATIONSHIP_ID", nullable=false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "prop_key", nullable=false)) + @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) @Column(name = "PROPERTY") private Map<String, String> properties = new HashMap<String, String>(); Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-10-07 11:53:31 UTC (rev 821) @@ -22,22 +22,21 @@ package org.jboss.identity.idm.impl.model.hibernate; -import org.hibernate.annotations.CollectionOfElements; +import java.util.HashMap; +import java.util.Map; -import javax.persistence.Table; +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Column; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; +import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import javax.persistence.JoinTable; -import java.util.Map; -import java.util.HashMap; +import org.hibernate.annotations.CollectionOfElements; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ @@ -79,6 +78,7 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; @Column(nullable = false, unique = true, name = "NAME") @@ -90,7 +90,7 @@ @CollectionOfElements @JoinTable(name = "jbid_io_rel_name_props", joinColumns = @JoinColumn(name = "REALATIONSHIP_NAME_ID", nullable=false)) - @org.hibernate.annotations.MapKey(columns = @Column(name = "prop_key", nullable=false)) + @org.hibernate.annotations.MapKey(columns = @Column(name = "PROP_KEY", nullable=false)) @Column(name = "PROPERTY") private Map<String, String> properties = new HashMap<String, String>(); Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-10-07 11:53:31 UTC (rev 821) @@ -22,16 +22,14 @@ package org.jboss.identity.idm.impl.model.hibernate; +import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ @@ -53,9 +51,10 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; - @Column(nullable = false, unique = true) + @Column(nullable = false, unique = true, name="NAME") private String name; public HibernateIdentityObjectRelationshipType() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectTextAttribute.java 2009-10-07 11:53:31 UTC (rev 821) @@ -27,9 +27,10 @@ import java.util.Set; import javax.persistence.Entity; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.OneToMany; import org.hibernate.annotations.CollectionOfElements; @@ -44,6 +45,7 @@ { @CollectionOfElements + @JoinTable(name = "jbid_io_attr_text_values", joinColumns = @JoinColumn(name = "value")) private Set<String> values = new HashSet<String>(); public HibernateIdentityObjectTextAttribute() Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-10-07 11:53:31 UTC (rev 821) @@ -52,9 +52,10 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; - @Column(nullable = false, unique = true) + @Column(nullable = false, unique = true, name="NAME") private String name; Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-10-07 11:53:31 UTC (rev 821) @@ -22,23 +22,20 @@ package org.jboss.identity.idm.impl.model.hibernate; -import org.hibernate.annotations.CollectionOfElements; +import java.util.HashMap; +import java.util.Map; +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Id; import javax.persistence.GeneratedValue; -import javax.persistence.Column; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.JoinTable; +import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.AttributeOverride; -import javax.persistence.MapKey; -import java.util.Map; -import java.util.HashMap; +import javax.persistence.JoinTable; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; +import org.hibernate.annotations.CollectionOfElements; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ @@ -53,6 +50,7 @@ @Id @GeneratedValue + @Column(name = "ID") private Long id; @Column(name = "NAME", nullable = false) Deleted: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java 2009-10-07 11:53:31 UTC (rev 821) @@ -1,61 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, 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.jboss.identity.idm.impl.model.hibernate; - -import org.hibernate.type.AbstractBynaryType; - -import java.sql.Types; - -/** - * {@inheritDoc} - * - * @author Steve Ebersole - */ -public class MaterializedBlobType extends AbstractBynaryType -{ - - public int sqlType() - { - return Types.BLOB; - } - - public String getName() - { - return "materialized-blob"; - } - - public Class getReturnedClass() - { - return byte[].class; - } - - protected Object toExternalFormat(byte[] bytes) - { - return bytes; - } - - protected byte[] toInternalFormat(Object bytes) - { - return ( byte[] ) bytes; - } -} \ No newline at end of file Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-10-07 11:53:31 UTC (rev 821) @@ -884,19 +884,19 @@ } } - org.hibernate.Query query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE_NAME) - .setParameter("fromIO", fromIO) - .setParameter("toIO", toIO) - .setParameter("typeName", type.getName()) - .setParameter("name", name); +// org.hibernate.Query query = getHibernateSession(ctx).createQuery(QUERY_RELATIONSHIP_BY_FROM_TO_TYPE_NAME) +// .setParameter("fromIO", fromIO) +// .setParameter("toIO", toIO) +// .setParameter("typeName", type.getName()) +// .setParameter("name", name); +// +// List results = query.list(); +// +// if (results.size() != 0) +// { +// throw new IdentityException("Relationship already present"); +// } - List results = query.list(); - - if (results.size() != 0) - { - throw new IdentityException("Relationship already present"); - } - HibernateIdentityObjectRelationship relationship = null; if (name != null) @@ -919,8 +919,16 @@ relationship = new HibernateIdentityObjectRelationship(type, fromIO, toIO); } - getHibernateSession(ctx).persist(relationship); + try + { + getHibernateSession(ctx).persist(relationship); + } + catch (HibernateException e) + { + throw new IdentityException("Cannot create relationship: ", e); + } + return relationship; } @@ -974,7 +982,7 @@ if (results == null) { - throw new IdentityException("Relationship already present"); + throw new IdentityException("Relationship not present in the store"); } HibernateIdentityObjectRelationship relationship = (HibernateIdentityObjectRelationship)results.iterator().next(); Modified: idm/trunk/idm-ldap/pom.xml =================================================================== --- idm/trunk/idm-ldap/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-ldap/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-spi/pom.xml =================================================================== --- idm/trunk/idm-spi/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-spi/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-testsuite/pom.xml =================================================================== --- idm/trunk/idm-testsuite/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-testsuite/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/trunk/idm-testsuite/src/test/resources/log4j.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/log4j.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/idm-testsuite/src/test/resources/log4j.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -1,32 +1,32 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" - value="[%d{dd/MM/yy hh:mm:ss:sss z}] %5p %c{2}: %m%n" /> - </layout> - </appender> + <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" + value="[%d{dd/MM/yy hh:mm:ss:sss z}] %5p %c{2}: %m%n" /> + </layout> + </appender> - <appender name="ASYNC" class="org.apache.log4j.AsyncAppender"> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> - </appender> + <appender name="ASYNC" class="org.apache.log4j.AsyncAppender"> + <appender-ref ref="CONSOLE"/> + <appender-ref ref="FILE"/> + </appender> - <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> - <param name="File" value="log4j-output.log"/> - <param name="MaxFileSize" value="1MB"/> - <param name="MaxBackupIndex" value="100"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" - value="[%d{dd/MM/yy hh:mm:ss:sss z}] %5p %c{2}: %m%n" /> - </layout> - </appender> + <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> + <param name="File" value="log4j-output.log"/> + <param name="MaxFileSize" value="1MB"/> + <param name="MaxBackupIndex" value="100"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" + value="[%d{dd/MM/yy hh:mm:ss:sss z}] %5p %c{2}: %m%n" /> + </layout> + </appender> - <root> - <priority value="info"/> - <appender-ref ref="CONSOLE"/> - <!--<appender-ref ref="ASYNC"/>--> - </root> + <root> + <priority value="info"/> + <appender-ref ref="CONSOLE"/> + <!--<appender-ref ref="ASYNC"/>--> + </root> </log4j:configuration> \ No newline at end of file Modified: idm/trunk/integration/deployer/pom.xml =================================================================== --- idm/trunk/integration/deployer/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/integration/deployer/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -8,12 +8,12 @@ <groupId>org.jboss.identity.idm.integration</groupId> <artifactId>idm-jboss5-deployer</artifactId> <packaging>jar</packaging> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-integration</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> </parent> <properties> Modified: idm/trunk/integration/jboss5/pom.xml =================================================================== --- idm/trunk/integration/jboss5/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/integration/jboss5/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -8,12 +8,12 @@ <groupId>org.jboss.identity.idm.integration</groupId> <artifactId>idm-jboss5</artifactId> <packaging>jar</packaging> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-integration</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> </parent> <dependencies> Modified: idm/trunk/integration/pom.xml =================================================================== --- idm/trunk/integration/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/integration/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/trunk/parent/pom.xml =================================================================== --- idm/trunk/parent/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/parent/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -8,7 +8,7 @@ <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <name>JBoss Identity IDM- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>JBoss Identity is a cross-cutting project that handles identity needs for the JEMS projects</description> Modified: idm/trunk/pom.xml =================================================================== --- idm/trunk/pom.xml 2009-10-06 22:26:30 UTC (rev 820) +++ idm/trunk/pom.xml 2009-10-07 11:53:31 UTC (rev 821) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-parent</artifactId> - <version>1.0.0.Beta2</version> + <version>1.0.0-BETA3-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>