[jboss-identity-commits] JBoss Identity SVN: r446 - in idm/trunk: distro/src/main/resources/installer and 1 other directories.

Author: jeff.yuchang Date: 2009-04-20 12:04:30 -0400 (Mon, 20 Apr 2009) New Revision: 446 Added: idm/trunk/integration/jboss5/src/main/resources/jboss.idm.hibernate.cfg.xml Removed: idm/trunk/integration/jboss5/src/main/resources/hibernate-jboss-identity.cfg.xml Modified: idm/trunk/distro/scripts/antrun-installer.xml idm/trunk/distro/src/main/resources/installer/install-definition.xml idm/trunk/integration/jboss5/src/main/resources/jboss-idm.xml Log: update the hibernate config file name. (Still one issue left, need to specify the sar depends on the ds JNDI in AS5 way). Modified: idm/trunk/distro/scripts/antrun-installer.xml =================================================================== --- idm/trunk/distro/scripts/antrun-installer.xml 2009-04-20 10:37:49 UTC (rev 445) +++ idm/trunk/distro/scripts/antrun-installer.xml 2009-04-20 16:04:30 UTC (rev 446) @@ -38,7 +38,7 @@ <property name="compile_classpath" value="${maven.compile.classpath}"/> <property name="database" value="hsqldb.url" /> - <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/db/jbossIdm" /> + <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/db/jbossidm" /> <property name="config.files.dir" value="${deploy.artifacts.resources}/jbidm-hsqldb-config" /> <property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" /> <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> Modified: idm/trunk/distro/src/main/resources/installer/install-definition.xml =================================================================== --- idm/trunk/distro/src/main/resources/installer/install-definition.xml 2009-04-20 10:37:49 UTC (rev 445) +++ idm/trunk/distro/src/main/resources/installer/install-definition.xml 2009-04-20 16:04:30 UTC (rev 446) @@ -11,11 +11,6 @@ <writeinstallationinformation>no</writeinstallationinformation> </info> <guiprefs width="600" height="440" resizable="yes"> - <!-- - <laf name="kunststoff"> - <os family="unix" /> - </laf> - --> </guiprefs> <locale> <langpack iso3="eng" /> @@ -50,14 +45,6 @@ <!-- Conditions --> <conditions> <!-- Target Server Conditions --> - <condition type="variable" id="isJBoss422"> - <name>jbossSelection</name> - <value>jboss422</value> - </condition> - <condition type="variable" id="isJBoss423"> - <name>jbossSelection</name> - <value>jboss423</value> - </condition> <condition type="variable" id="isJBoss500"> <name>jbossSelection</name> <value>jboss500</value> @@ -109,7 +96,7 @@ --> <pack name="jbossIdm Installation Files" required="yes" preselected="yes"> - <description>Installation directory containing docs, libs, and sources</description> + <description>Installation directory containing libs, dbscripts, modules and sources</description> <!-- jbossidm/doc--> <file src=&quot;(a){deploy.artifacts.dir}/jboss.eula.txt&quot; targetdir="$INSTALL_PATH" override="true" /> @@ -136,12 +123,10 @@ <pack name="Install JBoss Identity in JBoss" required="no" preselected="yes"> - <description>Installing the JBoss Identity into JBoss</description> + <description>Installing the JBoss idm into JBoss ( the idm-service.sar, and the corresponding datasource)</description> <!-- jboss idm/idm-service.sar --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/modules/idm-service.sar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/idm/idm-service.sar" override="true"> - <include name="*.*"/> - </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/modules/idm-service.sar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/idm/idm-service.sar" /> <!-- ============================== @@ -166,7 +151,7 @@ <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/hsqldb&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/hypersonic" condition="isHypersonic"> - <include name="jbIdm.*" /> + <include name="jbossidm.*" /> </fileset> <!-- Database MySQL --> Deleted: idm/trunk/integration/jboss5/src/main/resources/hibernate-jboss-identity.cfg.xml =================================================================== --- idm/trunk/integration/jboss5/src/main/resources/hibernate-jboss-identity.cfg.xml 2009-04-20 10:37:49 UTC (rev 445) +++ idm/trunk/integration/jboss5/src/main/resources/hibernate-jboss-identity.cfg.xml 2009-04-20 16:04:30 UTC (rev 446) @@ -1,61 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<hibernate-configuration> - <session-factory> - - <property name="show_sql">false</property> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> - - <property name="current_session_context_class">thread</property> - - <!--<property name="connection.datasource"></property>--> - - <property name="hibernate.connection.url">jdbc:hsqldb:mem:guvnor-identity</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration --> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>--> - - </session-factory> -</hibernate-configuration> \ No newline at end of file Modified: idm/trunk/integration/jboss5/src/main/resources/jboss-idm.xml =================================================================== --- idm/trunk/integration/jboss5/src/main/resources/jboss-idm.xml 2009-04-20 10:37:49 UTC (rev 445) +++ idm/trunk/integration/jboss5/src/main/resources/jboss-idm.xml 2009-04-20 16:04:30 UTC (rev 446) @@ -90,7 +90,7 @@ <options> <option> <name>hibernateConfiguration</name> - <value>hibernate-jboss-identity.cfg.xml</value> + <value>jboss.idm.hibernate.cfg.xml</value> </option> <option> <name>populateRelationshipTypes</name> Copied: idm/trunk/integration/jboss5/src/main/resources/jboss.idm.hibernate.cfg.xml (from rev 442, idm/trunk/integration/jboss5/src/main/resources/hibernate-jboss-identity.cfg.xml) =================================================================== --- idm/trunk/integration/jboss5/src/main/resources/jboss.idm.hibernate.cfg.xml (rev 0) +++ idm/trunk/integration/jboss5/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-04-20 16:04:30 UTC (rev 446) @@ -0,0 +1,61 @@ +<?xml version='1.0' encoding='utf-8'?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> +<hibernate-configuration> + <session-factory> + + <property name="show_sql">false</property> + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">false</property> + + <property name="current_session_context_class">thread</property> + + <!--<property name="connection.datasource"></property>--> + + <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbossidm</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration --> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>--> + <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>--> + + </session-factory> +</hibernate-configuration> \ No newline at end of file Property changes on: idm/trunk/integration/jboss5/src/main/resources/jboss.idm.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mergeinfo +