You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by av...@apache.org on 2010/03/18 15:06:07 UTC
svn commit: r924847 - in /incubator/photark/trunk:
photark-jcr/src/main/java/org/apache/photark/jcr/JCRRepositoryManager.java
photark-webapp/src/main/webapp/WEB-INF/web.composite
Author: avd
Date: Thu Mar 18 15:06:07 2010
New Revision: 924847
URL: http://svn.apache.org/viewvc?rev=924847&view=rev
Log:
JCR repository home is now configurable.
Modified:
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/JCRRepositoryManager.java
incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/JCRRepositoryManager.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/JCRRepositoryManager.java?rev=924847&r1=924846&r2=924847&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/JCRRepositoryManager.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/JCRRepositoryManager.java Thu Mar 18 15:06:07 2010
@@ -19,6 +19,7 @@
package org.apache.photark.jcr;
+import java.io.File;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -33,6 +34,7 @@ import org.apache.jackrabbit.core.Transi
import org.oasisopen.sca.annotation.Destroy;
import org.oasisopen.sca.annotation.EagerInit;
import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
import org.oasisopen.sca.annotation.Scope;
/**
@@ -44,6 +46,11 @@ import org.oasisopen.sca.annotation.Scop
public class JCRRepositoryManager {
private static final Logger logger = Logger.getLogger(JCRRepositoryManager.class.getName());
+ /**Default Name of the repository home directory */
+ private final String REPO_HOME_DEFAULT = "photark";
+
+ @Property(name="repositoryHome", required=true)
+ private String repositoryHome;
/** JCR Repository **/
private static Repository repository;
/** JCR Repository Session **/
@@ -58,6 +65,20 @@ public class JCRRepositoryManager {
initializeRepository();
}
+ @Property
+ public void setRepositoryHome(String repositoryHome){
+ if(repositoryHome != null && (!repositoryHome.isEmpty())){
+ this.repositoryHome = repositoryHome;
+ }else{
+ logger.log(Level.WARNING,"Setting Default Repository Home:" + REPO_HOME_DEFAULT);
+ this.repositoryHome = REPO_HOME_DEFAULT;
+ }
+ }
+
+ public String getRepositoryHome(){
+ return repositoryHome;
+ }
+
@Destroy
public void destroy() {
logger.log(Level.INFO,"Shutting down JCR repository");
@@ -87,7 +108,7 @@ public class JCRRepositoryManager {
logger.fine("Initializing JCR repository");
try {
if( repository == null) {
- repository = new TransientRepository();
+ repository = new TransientRepository(new File(repositoryHome));
}
session = repository.login(new SimpleCredentials("photarkUser", "passwordDoesNotMatter".toCharArray()));
} catch (Exception e) {
Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite?rev=924847&r1=924846&r2=924847&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite (original)
+++ incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite Thu Mar 18 15:06:07 2010
@@ -58,5 +58,6 @@
<!-- Component responsible for providing JCR Management Support -->
<component name="RepositoryManager">
<implementation.java class="org.apache.photark.jcr.JCRRepositoryManager"/>
+ <property name="repositoryHome">photark</property>
</component>
</composite>