You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2012/02/07 20:29:19 UTC
svn commit: r1241566 - in
/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src:
main/java/org/apache/chemistry/opencmis/inmemory/
main/java/org/apache/chemistry/opencmis/inmemory/server/
main/webapp/WEB-INF/classes...
Author: jens
Date: Tue Feb 7 19:29:18 2012
New Revision: 1241566
URL: http://svn.apache.org/viewvc?rev=1241566&view=rev
Log:
adaption to changed object generator
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/repository.properties
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java?rev=1241566&r1=1241565&r2=1241566&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/ConfigConstants.java Tue Feb 7 19:29:18 2012
@@ -37,12 +37,13 @@ public class ConfigConstants {
public static final String FILLER_CONTENT_SIZE = "RepositoryFiller.ContentSizeInKB";
public static final String FILLER_DOCUMENT_PROPERTY = "RepositoryFiller.DocumentProperty.";
public static final String FILLER_FOLDER_PROPERTY = "RepositoryFiller.FolderProperty.";
+ public static final String CONTENT_KIND = "RepositoryFiller.ContentKind";
// runtime configuration values
public static final String MAX_CONTENT_SIZE_KB = "InMemoryServer.MaxContentSizeKB";
public static final String CLEAN_REPOSITORY_INTERVAL = "InMemoryServer.CleanIntervalMinutes";
public static final String DEPLOYMENT_TIME = "InMemoryServer.DeploymentTime";
-
+
private ConfigConstants() {
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java?rev=1241566&r1=1241565&r2=1241566&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java Tue Feb 7 19:29:18 2012
@@ -285,6 +285,7 @@ public class InMemoryServiceFactoryImpl
// List<String> allAvailableRepositories = storeManager.getAllRepositoryIds();
String repositoryId = parameters.get(ConfigConstants.REPOSITORY_ID);
String doFillRepositoryStr = parameters.get(ConfigConstants.USE_REPOSITORY_FILER);
+ String contentKindStr = parameters.get(ConfigConstants.CONTENT_KIND);
boolean doFillRepository = doFillRepositoryStr == null ? false : Boolean.parseBoolean(doFillRepositoryStr);
if (doFillRepository /* && !allAvailableRepositories.contains(repositoryId) */ ) {
@@ -328,9 +329,25 @@ public class InMemoryServiceFactoryImpl
if (null != contentSizeKBStr) {
contentSizeKB = Integer.parseInt(contentSizeKBStr);
}
-
+
+ ObjectGenerator.CONTENT_KIND contentKind;
+ if (null == contentKindStr)
+ contentKind = ObjectGenerator.CONTENT_KIND.LoremIpsumText;
+ else {
+ if (contentKindStr.equals("static/text"))
+ contentKind = ObjectGenerator.CONTENT_KIND.StaticText;
+ else if (contentKindStr.equals("lorem/text"))
+ contentKind = ObjectGenerator.CONTENT_KIND.LoremIpsumText;
+ else if (contentKindStr.equals("lorem/html"))
+ contentKind = ObjectGenerator.CONTENT_KIND.LoremIpsumHtml;
+ else if (contentKindStr.equals("fractal/jpeg"))
+ contentKind = ObjectGenerator.CONTENT_KIND.ImageFractalJpeg;
+ else
+ contentKind = ObjectGenerator.CONTENT_KIND.StaticText;
+ }
// Create a hierarchy of folders and fill it with some documents
- ObjectGenerator gen = new ObjectGenerator(objectFactory, svc, svc, svc, repositoryId);
+ ObjectGenerator gen = new ObjectGenerator(objectFactory, svc, svc, svc, repositoryId,
+ contentKind);
gen.setNumberOfDocumentsToCreatePerFolder(docsPerLevel);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/repository.properties
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/repository.properties?rev=1241566&r1=1241565&r2=1241566&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/repository.properties (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/repository.properties Tue Feb 7 19:29:18 2012
@@ -48,4 +48,9 @@ RepositoryFiller.DocumentProperty.0=Stri
#RepositoryFiller.FolderProperty.0=StringFolderProp
# InMemoryServer.MaxContentSizeKB=4096
# InMemoryServer.CleanIntervalMinutes=240
-
+RepositoryFiller.ContentKind=lorem/text
+# RepositoryFiller.ContentKind=lorem/html
+# RepositoryFiller.ContentKind=static/text
+# RepositoryFiller.ContentKind=fractal/jpeg
+# slow!!
+
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java?rev=1241566&r1=1241565&r2=1241566&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/DiscoveryServiceTest.java Tue Feb 7 19:29:18 2012
@@ -52,7 +52,8 @@ public class DiscoveryServiceTest extend
public void testQuery() {
log.info("starting testQuery() ...");
- ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId);
+ ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
+ ObjectGenerator.CONTENT_KIND.LoremIpsumText);
gen.setNumberOfDocumentsToCreatePerFolder(3);
gen.setDocumentTypeId(TEST_DOCUMENT_TYPE_ID);
gen.setFolderTypeId(TEST_FOLDER_TYPE_ID);
@@ -121,7 +122,8 @@ public class DiscoveryServiceTest extend
String statement;
ObjectList res;
- ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId);
+ ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
+ ObjectGenerator.CONTENT_KIND.LoremIpsumText);
gen.setNumberOfDocumentsToCreatePerFolder(3);
gen.setDocumentTypeId(TEST_DOCUMENT_TYPE_ID);
gen.setFolderTypeId(TEST_FOLDER_TYPE_ID);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java?rev=1241566&r1=1241565&r2=1241566&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java Tue Feb 7 19:29:18 2012
@@ -229,7 +229,8 @@ public class NavigationServiceTest exten
private int createFolderHierachy(int levels, int childrenPerLevel) {
- ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId);
+ ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
+ ObjectGenerator.CONTENT_KIND.LoremIpsumText);
gen.createFolderHierachy(levels, childrenPerLevel, fRootFolderId);
int objCount = gen.getObjectsInTotal();
return objCount;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java?rev=1241566&r1=1241565&r2=1241566&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java Tue Feb 7 19:29:18 2012
@@ -440,7 +440,8 @@ public class ObjectServiceTest extends A
public void testBuildFolderAndDocuments() {
// Create a hierarchy of folders and fill it with some documents
- ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId);
+ ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
+ ObjectGenerator.CONTENT_KIND.LoremIpsumText);
int levels = 2; // create a hierarchy with two levels
int childrenPerLevel = 2; // create two folders on each level
@@ -566,7 +567,8 @@ public class ObjectServiceTest extends A
@Test
public void testDeleteTree() {
log.info("starting testDeleteTree() ...");
- ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId);
+ ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
+ ObjectGenerator.CONTENT_KIND.LoremIpsumText);
String rootFolderId = createFolder();
// Set the type id for all created documents:
gen.setDocumentTypeId(InMemoryDocumentTypeDefinition.getRootDocumentType().getId());
@@ -950,7 +952,8 @@ public class ObjectServiceTest extends A
// CMIS_BASE_TYPE_ID
// ;
String rootFolderId = createFolder();
- ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId);
+ ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepSvc, fRepositoryId,
+ ObjectGenerator.CONTENT_KIND.LoremIpsumText);
// Set the type id for all created documents:
gen.setDocumentTypeId(InMemoryDocumentTypeDefinition.getRootDocumentType().getId());
// Set the type id for all created folders: