Author: marijan
Date: Thu Aug 30 20:32:18 2012
New Revision: 1379122
URL: http://svn.apache.org/viewvc?rev=1379122&view=rev
Log:
- set initialize flag once initialized
- fix typo
Added:
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBootstrap.java
(contents, props changed)
- copied, changed from r1378999,
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBoostrap.java
Removed:
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBoostrap.java
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/test/AbstractRaveJCRTest.java
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1379122&r1=1379121&r2=1379122&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Thu Aug 30 20:32:18 2012
@@ -151,7 +151,7 @@
</bean>
<!--JCR Bootstrap -->
- <bean name="repositoryBootstrap"
class="org.apache.rave.jcr.bootstrapping.RaveBoostrap"
destroy-method="shutdown">
+ <bean name="repositoryBootstrap"
class="org.apache.rave.jcr.bootstrapping.RaveBootstrap"
destroy-method="shutdown">
<constructor-arg index="0" value="#{servletContext}"/>
<constructor-arg index="1" ref="lazyRepositoryFactory"/>
<constructor-arg index="2" ref="jcrCredentials"/>
Copied:
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBootstrap.java
(from r1378999,
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBoostrap.java)
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBootstrap.java?p2=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBootstrap.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBoostrap.java&r1=1378999&r2=1379122&rev=1379122&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBoostrap.java
(original)
+++
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBootstrap.java
Thu Aug 30 20:32:18 2012
@@ -24,12 +24,12 @@ import javax.servlet.ServletContext;
import org.apache.rave.jcr.LazyRepositoryFactory;
-public class RaveBoostrap extends Bootstrap {
+public class RaveBootstrap extends Bootstrap {
public static String RAVE_NAMESPACE_PREFIX = "rave";
public static String RAVE_NAMESPACE_URI = "http://rave.apache.org/jcr/1.0";;
- public RaveBoostrap(ServletContext servletContext, LazyRepositoryFactory
repositoryFactory, Credentials credentials,
- String workspaceName, boolean reload) throws
RepositoryException, BootstrapException {
+ public RaveBootstrap(ServletContext servletContext, LazyRepositoryFactory
repositoryFactory, Credentials credentials,
+ String workspaceName, boolean reload) throws
RepositoryException, BootstrapException {
super(servletContext, repositoryFactory, credentials, workspaceName,
reload, RAVE_NAMESPACE_PREFIX, RAVE_NAMESPACE_URI);
}
}
Propchange:
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBootstrap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/bootstrapping/RaveBootstrap.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/test/AbstractRaveJCRTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/test/AbstractRaveJCRTest.java?rev=1379122&r1=1379121&r2=1379122&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/test/AbstractRaveJCRTest.java
(original)
+++
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/test/AbstractRaveJCRTest.java
Thu Aug 30 20:32:18 2012
@@ -19,15 +19,15 @@ import javax.servlet.ServletException;
import org.apache.jackrabbit.test.AbstractJCRTest;
import org.apache.rave.jcr.LazyRepositoryFactory;
+import org.apache.rave.jcr.bootstrapping.RaveBootstrap;
import org.apache.rave.jcr.importing.ContentImporter;
import org.apache.rave.jcr.importing.ImportBehavior;
-import org.apache.rave.jcr.bootstrapping.RaveBoostrap;
/**
* Abstract base class for tests that want to run against a rave-bootstrapped
repository.
* You must make sure that you define
* <code>
- *
javax.jcr.tck.repository_stub_impl=org.apache.rave.jcr.jackrabbit.RaveRepositoryStub
+ *
javax.jcr.tck.repository_stub_impl=org.apache.rave.jcr.jackrabbit.RaveRepositoryStub
* </code>
* in your repositoryStubImpl.properties
*/
@@ -37,7 +37,7 @@ public abstract class AbstractRaveJCRTes
public void setUp() throws Exception {
super.setUp();
Repository repository = getHelper().getRepository();
- new RaveBoostrap(new MockServletContext(), new
LazyRepositoryFactory(new SimpleRepositoryFactory(repository)),
+ new RaveBootstrap(new MockServletContext(), new
LazyRepositoryFactory(new SimpleRepositoryFactory(repository)),
new SimpleCredentials("admin", "admin".toCharArray()),
"default", false);
}
@@ -46,7 +46,7 @@ public abstract class AbstractRaveJCRTes
* The node and its subtree are removed again during tearDown.
*
* @param nodeName the name of the node to be added below /testroot
- * @param content the inputstream of json content to be imported.
+ * @param content the inputstream of json content to be imported.
* @throws Exception
*/
protected void importContent(String nodeName, InputStream content) throws
Exception {
@@ -63,6 +63,7 @@ public abstract class AbstractRaveJCRTes
public SimpleRepositoryFactory(Repository repository) {
this.repository = repository;
}
+
@Override
public Repository getRepository(final Map parameters) throws
RepositoryException {
return repository;
Modified:
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java?rev=1379122&r1=1379121&r2=1379122&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
(original)
+++
rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ServletContextRepositoryFactory.java
Thu Aug 30 20:32:18 2012
@@ -51,7 +51,7 @@ public class ServletContextRepositoryFac
contextPath = "." + contextPath;
}
// first check for a context specific system property named
REPOSITORY_PATH_PARAM.<context path name>
- contextPath =
System.getProperty(REPOSITORY_PATH_PARAM+contextPath);
+ contextPath = System.getProperty(REPOSITORY_PATH_PARAM +
contextPath);
if (isEmpty(contextPath)) {
// Check for a global system property named
REPOSITORY_PATH_PARAM
contextPath = System.getProperty(REPOSITORY_PATH_PARAM);
@@ -68,6 +68,7 @@ public class ServletContextRepositoryFac
contextPath = null;
}
repositoryContextPath = contextPath;
+ initialized = true;
}
}
@@ -95,8 +96,8 @@ public class ServletContextRepositoryFac
}
if (context != null) {
Object o = context.getAttribute(this.attributeName);
- if (o != null && o instanceof Repository &&
((Repository)o).getDescriptor(Repository.SPEC_VERSION_DESC) != null) {
- return (Repository)o;
+ if (o != null && o instanceof Repository && ((Repository)
o).getDescriptor(Repository.SPEC_VERSION_DESC) != null) {
+ return (Repository) o;
}
}
return null;
