6:13 p.m.
Author: julien_viet
Date: 2010-02-08 19:13:13 -0500 (Mon, 08 Feb 2010)
New Revision: 1568
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
Log:
- fix the datasource name in sample portal repository configuration
- fix lucene index path for wsrp workspace
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-08
23:30:06 UTC (rev 1567)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-09
00:13:13 UTC (rev 1568)
@@ -541,7 +541,10 @@
private Application load(ContentDefinition contentDef)
{
- ContentType<?> contentType = contentDef.getCustomization().getType();
+ Customization customization = contentDef.getCustomization();
+
+ //
+ ContentType<?> contentType = customization.getType();
ApplicationType<?> applicationType = ApplicationType.getType(contentType);
//
@@ -556,8 +559,8 @@
application.setAccessPermissions(new
ArrayList<String>(contentDef.getAccessPermissions()));
application.setCreatedDate(contentDef.getCreationDate());
application.setModifiedDate(contentDef.getLastModificationDate());
- application.setStorageId(contentDef.getCustomization().getId());
- application.setContentId(contentDef.getCustomization().getContentId());
+ application.setStorageId(customization.getId());
+ application.setContentId(customization.getContentId());
return application;
}
Modified:
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
---
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-08
23:30:06 UTC (rev 1567)
+++
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-09
00:13:13 UTC (rev 1568)
@@ -29,7 +29,7 @@
<workspace name="sample-ws">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name"
value="${gatein.jcr.datasource.namee}${container.name.suffix}" />
+ <property name="source-name"
value="${gatein.jcr.datasource.name}${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
---
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-08
23:30:06 UTC (rev 1567)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-09
00:13:13 UTC (rev 1568)
@@ -276,7 +276,7 @@
</cache>
<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir"
value="${gatein.jcr.index.data.dir}/wsrp-system{container.name.suffix}"/>
+ <property name="index-dir"
value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/>
<property name="changesfilter-class"
value="${gatein.jcr.index.changefilterclass}" />
<property name="jbosscache-configuration"
value="conf/jcr/jbosscache/cluster/indexer-config.xml" />
<property name="jgroups-configuration"
value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" />