chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1404517 - in /chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit: ./ src/main/webapp/WEB-INF/classes/ src/main/webapp/WEB-INF/classes/META-INF/services/ src/test/resources/
Date Thu, 01 Nov 2012 09:42:03 GMT
Author: mduerig
Date: Thu Nov  1 09:42:02 2012
New Revision: 1404517

URL: http://svn.apache.org/viewvc?rev=1404517&view=rev
Log:
CMIS-581: Create maven profiles for chemistry-opencmis-test-fit
applied cleanup patch. credits to Ivan Vasyliev

Added:
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/jackrabbit-repository-memory.xml
  (with props)
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/modeshape-repository-memory.xml
  (with props)
Removed:
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/META-INF/services/org.modeshape.jcr.api.RepositoryFactory
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository-config.xml
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/repository.xml
Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/readme.txt
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/META-INF/services/javax.jcr.RepositoryFactory
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml?rev=1404517&r1=1404516&r2=1404517&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml Thu
Nov  1 09:42:02 2012
@@ -26,12 +26,12 @@
 
 	<properties>
 		<parentBasedir>../../</parentBasedir>
-		<modeshape.version>2.8.2.Final</modeshape.version>
+		<modeshape.version>2.8.3.Final</modeshape.version>
 		<forkMode>once</forkMode>
         <maven-failsafe-plugin.version>2.7.2</maven-failsafe-plugin.version>
         <maven-jetty-plugin.version>6.1.22</maven-jetty-plugin.version>
         <jcr.version>2.0</jcr.version>
-        <jackrabbit-core.version>2.5.1</jackrabbit-core.version>
+        <jackrabbit-core.version>2.5.2</jackrabbit-core.version>
         <slf4j-log4j12.version>1.6.4</slf4j-log4j12.version>
         <log4j.version>1.2.16</log4j.version>
     </properties>
@@ -57,7 +57,7 @@
 					</overlays>
 				   <webResources>
 				        <resource>
-			                <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+			                <directory>${project.basedir}/src/main/webapp/WEB-INF</directory>
 			                <filtering>true</filtering>
 			                <targetPath>WEB-INF</targetPath>
 			                <includes>
@@ -109,23 +109,23 @@
 					<systemProperties>
                         <systemProperty>
 			              <name>org.apache.chemistry.opencmis.session.repository.id</name>
-			              <value>${jcr.repository}</value>
+			              <value>${repository}</value>
 			            </systemProperty>
 			            <systemProperty>
 			              <name>org.apache.chemistry.opencmis.user</name>
-			              <value>${jcr.username}</value>
+			              <value>${user}</value>
 			            </systemProperty>
 			            <systemProperty>
 			              <name>org.apache.chemistry.opencmis.password</name>
-			              <value>${jcr.password}</value>
+			              <value>${password}</value>
 			            </systemProperty>
- 	                	<systemProperty>
-		                	<name>org.apache.jackrabbit.repository.conf</name>
-		                	<value>${basedir}/src/test/resources/repository.xml</value>
-	                	</systemProperty>
 	                	<systemProperty>
-	                		<name>org.apache.jackrabbit.repository.home</name>
-	                		<value>${basedir}/target/jackrabbit-repo</value>
+	                		<name>project.basedir</name>
+	                		<value>${project.basedir}</value>
+	                	</systemProperty>
+                        <systemProperty>
+	                		<name>project.build.directory</name>
+	                		<value>${project.build.directory}</value>
 	                	</systemProperty>
 		            </systemProperties>					
 					<webAppConfig>
@@ -177,10 +177,10 @@
             <properties>
             	<overlay.groupId>org.apache.chemistry.opencmis</overlay.groupId>
             	<overlay.artifactId>chemistry-opencmis-server-jcr</overlay.artifactId>
-            	<jcr.factory.class>org.apache.chemistry.opencmis.jcr.JcrServiceFactory</jcr.factory.class>
+            	<factory.class>org.apache.chemistry.opencmis.jcr.JcrServiceFactory</factory.class>
             	<!-- Uses in ServiceLoader to look up impl. -->
-            	<jcr.service.factory.class>org.modeshape.jcr.JcrRepositoryFactory</jcr.service.factory.class>
-            	<jcr.repository>test</jcr.repository>
+            	<service.factory.class>org.modeshape.jcr.JcrRepositoryFactory</service.factory.class>
+            	<repository>test</repository>
             </properties>
 	        <dependencies>
 		        <dependency>
@@ -199,14 +199,23 @@
 		            <artifactId>chemistry-opencmis-server-bindings</artifactId>
 		            <version>${project.version}</version>
 		            <classifier>classes</classifier>
-		        </dependency>
-		
+		        </dependency>		
 		        <dependency>
 		            <groupId>org.apache.chemistry.opencmis</groupId>
 		            <artifactId>chemistry-opencmis-server-jcr</artifactId>
 		            <version>${project.version}</version>
 		            <classifier>classes</classifier>
-		        </dependency>				        
+		        </dependency>
+                <dependency>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <version>${slf4j-log4j12.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                    <version>${log4j.version}</version>
+                </dependency>                
 	        </dependencies>
         </profile>
         <profile>
@@ -217,10 +226,10 @@
             <properties>
             	<overlay.groupId>${project.groupId}</overlay.groupId>
             	<overlay.artifactId>chemistry-opencmis-server-inmemory</overlay.artifactId>
-            	<jcr.factory.class>org.apache.chemistry.opencmis.inmemory.server.InMemoryServiceFactoryImpl</jcr.factory.class>
+            	<factory.class>org.apache.chemistry.opencmis.inmemory.server.InMemoryServiceFactoryImpl</factory.class>
             	<!-- Uses in ServiceLoader to look up impl. -->
-            	<jcr.service.factory.class>${jcr.factory.class}</jcr.service.factory.class>
-            	<jcr.repository>test</jcr.repository>
+            	<service.factory.class>${factory.class}</service.factory.class>
+            	<repository>test</repository>
             </properties>
 	        <dependencies>
 	        	<dependency>
@@ -229,19 +238,29 @@
 					<version>${project.version}</version>
 					<type>war</type>
 				</dependency>
-	        </dependencies>
+                <dependency>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <version>${slf4j-log4j12.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                    <version>${log4j.version}</version>
+                </dependency>                
+             </dependencies>
 	    </profile>
         <profile>
-            <id>jcr-jackrabbit-filesystem</id>
+            <id>jcr-jackrabbit-inmemory</id>
             <properties>
             	<overlay.groupId>${project.groupId}</overlay.groupId>
             	<overlay.artifactId>chemistry-opencmis-server-bindings</overlay.artifactId>
-            	<jcr.factory.class>org.apache.chemistry.opencmis.jcr.JcrServiceFactory</jcr.factory.class>
+            	<factory.class>org.apache.chemistry.opencmis.jcr.JcrServiceFactory</factory.class>
             	<!-- Uses in ServiceLoader to look up impl.  -->
-            	<jcr.service.factory.class>org.apache.jackrabbit.core.RepositoryFactoryImpl</jcr.service.factory.class>
-            	<jcr.repository>default</jcr.repository>  
-            	<jcr.username>admin</jcr.username>
-            	<jcr.password>admin</jcr.password>
+            	<service.factory.class>org.apache.jackrabbit.core.RepositoryFactoryImpl</service.factory.class>
+            	<repository>default</repository>  
+            	<user>admin</user>
+            	<password>admin</password>
             	<forkMode>never</forkMode>
             </properties>
 	        <dependencies>
@@ -276,8 +295,7 @@
 		            <artifactId>chemistry-opencmis-server-bindings</artifactId>
 		            <version>${project.version}</version>
 		            <classifier>classes</classifier>
-		        </dependency>
-		
+		        </dependency>		
 		        <dependency>
 		            <groupId>org.apache.chemistry.opencmis</groupId>
 		            <artifactId>chemistry-opencmis-server-jcr</artifactId>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/readme.txt
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/readme.txt?rev=1404517&r1=1404516&r2=1404517&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/readme.txt
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/readme.txt
Thu Nov  1 09:42:02 2012
@@ -1,2 +1,2 @@
-There are three profiles: jcr-modeshape-inmemory, chemistry-inmemory, jcr-jackrabbit-filesystem
+There are three profiles: chemistry-inmemory, jcr-modeshape-inmemory,  jcr-jackrabbit-inmemory
 Please, use mvn clean install -P <profileName> for testing one of the repository implementations.

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/META-INF/services/javax.jcr.RepositoryFactory
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/META-INF/services/javax.jcr.RepositoryFactory?rev=1404517&r1=1404516&r2=1404517&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/META-INF/services/javax.jcr.RepositoryFactory
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/META-INF/services/javax.jcr.RepositoryFactory
Thu Nov  1 09:42:02 2012
@@ -1 +1 @@
-${jcr.service.factory.class} # JCR Implementation
+${service.factory.class} # JCR Implementation

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties?rev=1404517&r1=1404516&r2=1404517&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties
Thu Nov  1 09:42:02 2012
@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class=${jcr.factory.class}
+class=${factory.class}
 
 # In Memory Settings
-InMemoryServer.RepositoryId=${jcr.repository}
+InMemoryServer.RepositoryId=${repository}
 # InMemoryServer.RepositoryInfoCreatorClass=org.apache.chemistry.opencmis.client.provider.inmemory.UnitTestRepositoryInfo
-InMemoryServer.User=${jcr.repository}
-InMemoryServer.Password=${jcr.repository}
+InMemoryServer.User=${user}
+InMemoryServer.Password=${password}
 InMemoryServer.TypesCreatorClass=org.apache.chemistry.opencmis.inmemory.types.DefaultTypeSystemCreator
 
 # settings for init repository with data
@@ -46,7 +46,9 @@ RepositoryFiller.DocumentProperty.0=Stri
 mount-path=/
 
 #Jackrabbit properties
-jcr.org.apache.jackrabbit.repository.uri=file:///${basedir}/target/jcr-repository
+#jcr.org.apache.jackrabbit.repository.uri=file:///{project.basedir}/target/jcr-repository
+jcr.org.apache.jackrabbit.repository.home={project.basedir}/target/jackrabbit-repo
+jcr.org.apache.jackrabbit.repository.conf={project.basedir}/src/test/resources/jackrabbit-repository-memory.xml
 
 #Modeshape properties
-jcr.org.modeshape.jcr.URL=file:///${basedir}/src/main/webapp/WEB-INF/classes/repository-config.xml
+jcr.org.modeshape.jcr.URL=file:///{project.basedir}/src/test/resources/modeshape-repository-memory.xml

Added: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/jackrabbit-repository-memory.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/jackrabbit-repository-memory.xml?rev=1404517&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/jackrabbit-repository-memory.xml
(added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/jackrabbit-repository-memory.xml
Thu Nov  1 09:42:02 2012
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<!DOCTYPE Repository
+        PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN"
+        "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+
+<!-- Example Repository Configuration File
+     Used by
+     - org.apache.jackrabbit.core.config.RepositoryConfigTest.java
+     -
+-->
+<Repository>
+    <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"></FileSystem>
+    <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+    <Security appName="Jackrabbit">
+        <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" workspaceName="security">
+            <!-- <WorkspaceAccessManager class="..."/> -->
+            <!-- <param name="config" value="${rep.home}/security.xml"/> -->
+        </SecurityManager>
+        <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+            <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+        </AccessManager>
+        <LoginModule class="org.apache.jackrabbit.core.security.authentication.DefaultLoginModule">
+            <!--
+              anonymous user name ('anonymous' is the default value)
+            -->
+            <param name="anonymousId" value="anonymous"/>
+            <!--
+              administrator user id (default value if param is missing is 'admin')
+            -->
+            <param name="adminId" value="admin"/>
+        </LoginModule>
+    </Security>
+    <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+    <Workspace name="${wsp.name}">
+        <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+            <param name="blobFSBlockSize" value="1"/>
+            <!-- store in memory -->
+        </PersistenceManager>
+        <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+            <param name="path" value="${wsp.home}/index"/>
+            <param name="supportHighlighting" value="true"/>
+            <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager"/>
+            <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"></FileSystem>
+        </SearchIndex>
+    </Workspace>
+    <Versioning rootPath="${rep.home}/version">
+        <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem">
+        </FileSystem>
+        <!--
+            Configures the persistence manager to be used for persisting version state.
+            Please note that the current versioning implementation is based on
+            a 'normal' persistence manager, but this could change in future
+            implementations.
+        -->
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
+            <param name="blobFSBlockSize" value="1"/>
+            <!-- store in memory -->
+        </PersistenceManager>
+    </Versioning>
+
+    <!--
+        Search index for content that is shared repository wide
+        (/jcr:system tree, contains mainly versions)
+    -->
+    <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+        <param name="path" value="${rep.home}/repository/index"/>
+        <param name="supportHighlighting" value="true"/>
+        <param name="directoryManagerClass" value="org.apache.jackrabbit.core.query.lucene.directory.RAMDirectoryManager"/>
+        <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"></FileSystem>
+    </SearchIndex>
+
+    <!--
+        Run with a cluster journal
+    -->
+    <Cluster id="node1">
+        <Journal class="org.apache.jackrabbit.core.journal.FileJournal">
+            <param name="revision" value="${rep.home}/revision.log"/>
+            <param name="directory" value="${rep.home}/myjournal"/>
+        </Journal>
+    </Cluster>
+</Repository>

Propchange: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/jackrabbit-repository-memory.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/modeshape-repository-memory.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/modeshape-repository-memory.xml?rev=1404517&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/modeshape-repository-memory.xml
(added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/modeshape-repository-memory.xml
Thu Nov  1 09:42:02 2012
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<configuration xmlns:mode="http://www.modeshape.org/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
+    <mode:sources jcr:primaryType="nt:unstructured">
+        <mode:source jcr:name="Store" 
+                    mode:classname="org.modeshape.graph.connector.inmemory.InMemoryRepositorySource"

+                    mode:description="The repository for our content" 
+                    mode:defaultWorkspaceName="test"
+                    mode:predefinedWorkspaceNames="test"
+                    mode:creatingWorkspacesAllowed="true"
+                    mode:updatesAllowed="true">
+
+        </mode:source>
+    </mode:sources>
+    <mode:mimeTypeDetectors>
+        <mode:mimeTypeDetector jcr:name="Detector">
+            <mode:description>Standard extension-based MIME type detector</mode:description>
+            <mode:classname>org.modeshape.graph.mimetype.ExtensionBasedMimeTypeDetector</mode:classname>
+            <mode:classpath></mode:classpath>
+        </mode:mimeTypeDetector>
+    </mode:mimeTypeDetectors>
+    <mode:repositories>
+        <mode:repository jcr:name="Test Repository Source">
+            <mode:source>Store</mode:source>
+            <mode:options jcr:primaryType="mode:options">
+                <mode:option jcr:name="projectNodeTypes" mode:value="true"/>
+                <mode:option jcr:name="removeDerivedContentWithOriginal" mode:value="true"/>
+                <mode:option jcr:name="useAnonymousAccessOnFailedLogin" mode:value="true"/>
+                <!--<mode:option jcr:name="queryIndexesUpdatedSynchronously" mode:value="true"/>-->
+                <!--<mode:option jcr:name="queryIndexesRebuiltSynchronously" mode:value="true"/>-->
+                <!--<mode:option jcr:name="rebuildQueryIndexOnStartup" mode:value="always"/>-->
+                <!--<mode:option jcr:name="queryIndexDirectory" mode:value="./target/wdRepoWithProps/indexes"/>-->
+            </mode:options>
+            <namespaces jcr:primaryType="mode:namespaces">
+                <modetest jcr:primaryType="mode:namespace" mode:uri="http://acme.com/product/1.0"/>
+            </namespaces>
+        </mode:repository>
+    </mode:repositories>
+</configuration>

Propchange: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/modeshape-repository-memory.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message