11:47 a.m.
Author: bdaw
Date: 2007-03-03 12:47:59 -0500 (Sat, 03 Mar 2007)
New Revision: 6501
Removed:
trunk/identity/src/main/org/jboss/portal/test/identity/db_old/
Modified:
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml
trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java
trunk/identity/src/resources/test/config/standardidentity-config.xml
Log:
- cleanup
Modified:
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml
===================================================================
---
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-03-03
16:38:30 UTC (rev 6500)
+++
trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-03-03
17:47:59 UTC (rev 6501)
@@ -63,45 +63,6 @@
</option>
</config>
</datasource>
- <!--<datasource>
- <name>DB</name>
- <service-name>portal:service=Hibernate</service-name>
-
<class>org.jboss.portal.identity2.experimental.db.IdentitySessionFactoryBinder</class>
- <config>
- <option>
- <name>doChecking</name>
- <value>true</value>
- </option>
- <option>
- <name>configLocation</name>
- <value>hibernate-single.cfg.xml</value>
- </option>
- --><!--<option>
- <name>setupLocation</name>
- <value>conf/hibernate/user/setup.txt</value>
- </option>--><!--
- <option>
- <name>jNDIName</name>
- <value>java:/portal/UserSessionFactory</value>
- </option>
- <option>
- <name>profileConfigFile</name>
- <value>profile-config.xml</value>
- </option>
- <option>
- <name>mappingTemplateFile</name>
- <value>domain-template.hbm.xml</value>
- </option>
- <option>
- <name>mappingOutputFile</name>
- <value>domain-identity.hbm.xml</value>
- </option>
- <option>
- <name>mappingPattern</name>
- <value><![CDATA[<property name="@name@"
column="@column@" type="java.lang.String" update="true"
insert="true" unique="false"/>]]></value>
- </option>
- </config>
- </datasource>-->
</datasources>
<modules>
@@ -113,7 +74,7 @@
<!--name of service and class for creating mbean-->
<service-name>portal:service=Module,type=UserProfile</service-name>
<class>org.jboss.portal.identity.DelegatingUserProfileModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>jndiName</name>
@@ -141,7 +102,7 @@
<service-name>portal:service=Module,type=User</service-name>
<class>org.jboss.portal.identity.db.HibernateUserModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>sessionFactoryJNDIName</name>
@@ -163,7 +124,7 @@
<service-name>portal:service=Module,type=Role</service-name>
<class>org.jboss.portal.identity.db.HibernateRoleModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>sessionFactoryJNDIName</name>
@@ -185,7 +146,7 @@
<service-name>portal:service=Module,type=Membership</service-name>
<class>org.jboss.portal.identity.db.HibernateMembershipModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>sessionFactoryJNDIName</name>
@@ -207,7 +168,7 @@
<service-name>portal:service=Module,type=DBUserProfile</service-name>
<class>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>sessionFactoryJNDIName</name>
@@ -230,7 +191,7 @@
<service-name>portal:service=Module,type=User</service-name>
<class>org.jboss.portal.identity.ldap.LDAPUserModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>jndiName</name>
@@ -252,7 +213,7 @@
<service-name>portal:service=Module,type=Role</service-name>
<class>org.jboss.portal.identity.ldap.LDAPRoleModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>jndiName</name>
@@ -274,7 +235,7 @@
<service-name>portal:service=Module,type=Membership</service-name>
<class>org.jboss.portal.identity.ldap.LDAPStaticGroupMembershipModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
<option>
<name>jndiName</name>
@@ -296,22 +257,9 @@
<service-name>portal:service=Module,type=LDAPUserProfile</service-name>
<class>org.jboss.portal.identity.ldap.LDAPUserProfileModuleImpl</class>
- <!--set of options that are passed to a class constructor-->
+ <!--set of options that are set in instantiated object-->
<config>
- <!--<option>
- <name>LDAPConnectionJNDIName</name>
- <value>java:/portal/UserSessionFactory</value>
- </option>-->
- <!--Hibernate mappings for db level store (dynamic properties not mapped
as ldap attributes)-->
- <!--<option>
- <name>SessionFactoryJNDIName</name>
- <value>java:/portal/PropertyStoreSessionFactory</value>
- </option>
<option>
- <name>profileMappings</name>
- <value>ldap-profile.xml</value>
- </option>-->
- <option>
<name>jndiName</name>
<value>java:/portal/LDAPUserProfileModule</value>
</option>
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java
===================================================================
---
trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java 2007-03-03
16:38:30 UTC (rev 6500)
+++
trunk/identity/src/main/org/jboss/portal/test/identity/UserProtoTestCase.java 2007-03-03
17:47:59 UTC (rev 6501)
@@ -53,7 +53,7 @@
Appender appender = new ConsoleAppender(new SimpleLayout());
Logger.getRoot().addAppender(appender);
Logger.getRoot().setLevel(Level.INFO);
- Logger.getLogger("org.jboss.portal.identity2").setLevel(Level.DEBUG);
+ Logger.getLogger("org.jboss.portal.identity").setLevel(Level.DEBUG);
}
/*public static TestSuite createTestSuite(Class clazz) throws Exception
Modified: trunk/identity/src/resources/test/config/standardidentity-config.xml
===================================================================
--- trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-03-03
16:38:30 UTC (rev 6500)
+++ trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-03-03
17:47:59 UTC (rev 6501)
@@ -61,45 +61,6 @@
</option>
</config>
</datasource>
- <!--<datasource>
- <name>DB</name>
- <service-name>portal:service=Hibernate</service-name>
-
<class>org.jboss.portal.identity2.experimental.db.IdentitySessionFactoryBinder</class>
- <config>
- <option>
- <name>doChecking</name>
- <value>true</value>
- </option>
- <option>
- <name>configLocation</name>
- <value>hibernate-single.cfg.xml</value>
- </option>
- --><!--<option>
- <name>setupLocation</name>
- <value>conf/hibernate/user/setup.txt</value>
- </option>--><!--
- <option>
- <name>jNDIName</name>
- <value>java:/portal/UserSessionFactory</value>
- </option>
- <option>
- <name>profileConfigFile</name>
- <value>profile-config.xml</value>
- </option>
- <option>
- <name>mappingTemplateFile</name>
- <value>domain-template.hbm.xml</value>
- </option>
- <option>
- <name>mappingOutputFile</name>
- <value>domain-identity.hbm.xml</value>
- </option>
- <option>
- <name>mappingPattern</name>
- <value><![CDATA[<property name="@name@"
column="@column@" type="java.lang.String" update="true"
insert="true" unique="false"/>]]></value>
- </option>
- </config>
- </datasource>-->
</datasources>
<modules>