Author: bcarothers Date: 2009-07-12 18:01:21 -0400 (Sun, 12 Jul 2009) New Revision: 1089 Modified: trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorReadableTest.java trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorWritableTest.java Log: DNA-485 Standardize Default Workspace Name Property Across Sources Applied patch that renames the Java bean property nameOfDefaultWorkspace on JBossCacheSource to defaultWorkspaceName to adhere to the implicit standard set by InMemoryRepositorySource. Since the Infinispan connector has not yet been committed, the corresponding fix will be committed with the initial check-in for that connector. Modified: trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java =================================================================== --- trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java 2009-07-12 21:08:48 UTC (rev 1088) +++ trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java 2009-07-12 22:01:21 UTC (rev 1089) @@ -95,7 +95,7 @@ public static final String DEFAULT_UUID_PROPERTY_NAME = DnaLexicon.UUID.getString(); /** - * The initial {@link #getNameOfDefaultWorkspace() name of the default workspace} is "{@value} ", unless otherwise specified. + * The initial {@link #getDefaultWorkspaceName() name of the default workspace} is "{@value} ", unless otherwise specified. */ public static final String DEFAULT_NAME_OF_DEFAULT_WORKSPACE = "default"; @@ -365,7 +365,7 @@ * * @return the name of the workspace that should be used by default; never null */ - public String getNameOfDefaultWorkspace() { + public String getDefaultWorkspaceName() { return defaultWorkspace; } @@ -375,7 +375,7 @@ * @param nameOfDefaultWorkspace the name of the workspace that should be used by default, or null if the * {@link #DEFAULT_NAME_OF_DEFAULT_WORKSPACE default name} should be used */ - public synchronized void setNameOfDefaultWorkspace( String nameOfDefaultWorkspace ) { + public synchronized void setDefaultWorkspaceName( String nameOfDefaultWorkspace ) { this.defaultWorkspace = nameOfDefaultWorkspace != null ? nameOfDefaultWorkspace : DEFAULT_NAME_OF_DEFAULT_WORKSPACE; } @@ -472,7 +472,8 @@ if (cacheFactory == null) cacheFactory = new DefaultCacheFactory<UUID, MapNode>(); // Now create the repository ... - this.repository = new JBossCacheRepository(getName(), this.rootNodeUuid, createNewCache(cacheFactory, getName())); + this.repository = new JBossCacheRepository(getName(), this.rootNodeUuid, this.defaultWorkspace, + createNewCache(cacheFactory, getName())); // Create the set of initial names ... for (String initialName : getPredefinedWorkspaceNames()) @@ -576,7 +577,7 @@ ref.add(new StringRefAddr(CACHE_FACTORY_JNDI_NAME, getCacheFactoryJndiName())); ref.add(new StringRefAddr(CACHE_CONFIGURATION_NAME, getCacheConfigurationName())); ref.add(new StringRefAddr(RETRY_LIMIT, Integer.toString(getRetryLimit()))); - ref.add(new StringRefAddr(DEFAULT_WORKSPACE, getNameOfDefaultWorkspace())); + ref.add(new StringRefAddr(DEFAULT_WORKSPACE, getDefaultWorkspaceName())); ref.add(new StringRefAddr(ALLOW_CREATING_WORKSPACES, Boolean.toString(isCreatingWorkspacesAllowed()))); String[] workspaceNames = getPredefinedWorkspaceNames(); if (workspaceNames != null && workspaceNames.length != 0) { @@ -654,7 +655,7 @@ source.setDefaultCachePolicy((CachePolicy)defaultCachePolicy); } if (retryLimit != null) source.setRetryLimit(Integer.parseInt(retryLimit)); - if (defaultWorkspace != null) source.setNameOfDefaultWorkspace(defaultWorkspace); + if (defaultWorkspace != null) source.setDefaultWorkspaceName(defaultWorkspace); if (createWorkspaces != null) source.setCreatingWorkspacesAllowed(Boolean.parseBoolean(createWorkspaces)); if (workspaceNames != null && workspaceNames.length != 0) source.setPredefinedWorkspaceNames(workspaceNames); return source; Modified: trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorReadableTest.java =================================================================== --- trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorReadableTest.java 2009-07-12 21:08:48 UTC (rev 1088) +++ trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorReadableTest.java 2009-07-12 22:01:21 UTC (rev 1089) @@ -54,7 +54,7 @@ JBossCacheSource source = new JBossCacheSource(); source.setName("Test Repository"); source.setPredefinedWorkspaceNames(predefinedWorkspaceNames); - source.setNameOfDefaultWorkspace(predefinedWorkspaceNames[0]); + source.setDefaultWorkspaceName(predefinedWorkspaceNames[0]); source.setCreatingWorkspacesAllowed(false); // Set up the mock JNDI ... Modified: trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorWritableTest.java =================================================================== --- trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorWritableTest.java 2009-07-12 21:08:48 UTC (rev 1088) +++ trunk/extensions/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheConnectorWritableTest.java 2009-07-12 22:01:21 UTC (rev 1089) @@ -52,7 +52,7 @@ JBossCacheSource source = new JBossCacheSource(); source.setName("Test Repository"); source.setPredefinedWorkspaceNames(predefinedWorkspaceNames); - source.setNameOfDefaultWorkspace(predefinedWorkspaceNames[0]); + source.setDefaultWorkspaceName(predefinedWorkspaceNames[0]); source.setCreatingWorkspacesAllowed(true); // Set up the mock JNDI ...