Author: chris.laprun(a)jboss.com Date: 2009-11-27 16:07:48 -0500 (Fri, 27 Nov 2009) New Revision: 846 Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml Log: - Re-added changes that got lost during the merge due to improper conflict resolution. Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2009-11-27 20:45:23 UTC (rev 845) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2009-11-27 21:07:48 UTC (rev 846) @@ -121,7 +121,7 @@ <description>Node types configuration file</description> <value>jar:/conf/ext-nodetypes-config.xml</value> <value>jar:/conf/organization-nodetypes.xml</value> - <value>jar:/conf/standalone/nodetypes.xml</value> + <value>jar:/conf/mop-nodetypes.xml</value> <value>jar:/conf/portal/portal-nodetypes.xml</value> <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value> <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value> Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-11-27 20:45:23 UTC (rev 845) +++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-11-27 21:07:48 UTC (rev 846) @@ -122,7 +122,7 @@ <description>Node types configuration file</description> <value>jar:/conf/ext-nodetypes-config.xml</value> <value>jar:/conf/organization-nodetypes.xml</value> - <value>jar:/conf/standalone/nodetypes.xml</value> + <value>jar:/conf/mop-nodetypes.xml</value> <value>jar:/conf/portal/portal-nodetypes.xml</value> <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value> <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>