From 45359adc09ac1d9e48206c549e667ed6965c7cd3 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 28 May 2007 15:31:13 +0000
Subject: [PATCH] Fix the following issues:
---
opends/resource/admin/clientMO.xsl | 77 ++++++++++++++++----------------------
1 files changed, 32 insertions(+), 45 deletions(-)
diff --git a/opends/resource/admin/clientMO.xsl b/opends/resource/admin/clientMO.xsl
index 3db6324..2e6197e 100644
--- a/opends/resource/admin/clientMO.xsl
+++ b/opends/resource/admin/clientMO.xsl
@@ -176,34 +176,26 @@
<xsl:with-param name="indent" select="2" />
<xsl:with-param name="content"
select="concat(
- 'Creates the ', $ufn,' if it does not exist yet.
',
+ 'Creates a new ', $ufn,'. The new ', $ufn,' will initially ',
+ 'not contain any property values (including mandatory ',
+ 'properties). Once the ', $ufn,' has been configured it ',
+ 'can be added to the server using the {@link #commit()} ',
+ 'method.
',
'
',
'@param <C>
',
- ' The type of the ', $ufn,' being added.
',
+ ' The type of the ', $ufn,' being created.
',
'@param d
',
' The definition of the ', $ufn,' to be created.
',
- '@param p
',
- ' A property provider which can be used to initialize the property values of the new ', $ufn,'.
',
- '@return Returns the ', $ufn,' instance representing the ', $ufn,' that was created.
',
- '@throws ManagedObjectDecodingException
',
- ' If the ', $ufn,' could not be created because one or more of its properties are invalid.
',
- '@throws ManagedObjectAlreadyExistsException
',
- ' If the ', $ufn,' cannot be created because it already exists on the server.
',
- '@throws ConcurrentModificationException
',
- ' If this ', $ufn,' has been removed from the server by another client.
',
- '@throws OperationRejectedException
',
- ' If the server refuses to create the ', $ufn,' due to some server-side constraint which cannot be satisfied.
',
- '@throws AuthorizationException
',
- ' If the server refuses to create the ', $ufn,' because the client does not have the correct privileges.
',
- '@throws CommunicationException
',
- ' If the client cannot contact the server due to an underlying communication problem.
')" />
+ '@param exceptions
',
+ ' An optional collection in which to place any ',
+ '{@link DefaultBehaviorException}s that occurred whilst ',
+ 'attempting to determine the default values of the ', $ufn,
+ '. This argument can be <code>null<code>.
',
+ '@return Returns a new ', $ufn,' configuration instance.
')" />
</xsl:call-template>
<xsl:value-of
select="concat(' <C extends ', $java-class-name,'CfgClient> C create', $java-relation-name, '(
',
- ' ManagedObjectDefinition<C, ?> d, PropertyProvider p)
',
- ' throws ManagedObjectDecodingException, ManagedObjectAlreadyExistsException,
',
- ' ConcurrentModificationException, OperationRejectedException,
',
- ' AuthorizationException, CommunicationException;
')" />
+ ' ManagedObjectDefinition<C, ?> d, Collection<DefaultBehaviorException> exceptions);
')" />
<xsl:text>
</xsl:text>
<xsl:text>
</xsl:text>
<xsl:text>
</xsl:text>
@@ -297,36 +289,28 @@
<xsl:with-param name="indent" select="2" />
<xsl:with-param name="content"
select="concat(
- 'Creates a new ', $ufn,'.
',
+ 'Creates a new ', $ufn,'. The new ', $ufn,' will initially ',
+ 'not contain any property values (including mandatory ',
+ 'properties). Once the ', $ufn,' has been configured it ',
+ 'can be added to the server using the {@link #commit()} ',
+ 'method.
',
'
',
'@param <C>
',
- ' The type of the ', $ufn,' being added.
',
+ ' The type of the ', $ufn,' being created.
',
'@param d
',
' The definition of the ', $ufn,' to be created.
',
'@param name
',
' The name of the new ', $ufn,'.
',
- '@param p
',
- ' A property provider which can be used to initialize the property values of the new ', $ufn,'.
',
- '@return Returns a new ', $ufn,' instance representing the ', $ufn,' that was created.
',
- '@throws ManagedObjectDecodingException
',
- ' If the ', $ufn,' could not be created because one or more of its properties are invalid.
',
- '@throws ManagedObjectAlreadyExistsException
',
- ' If the ', $ufn,' cannot be created because it already exists on the server.
',
- '@throws ConcurrentModificationException
',
- ' If this ', $ufn,' has been removed from the server by another client.
',
- '@throws OperationRejectedException
',
- ' If the server refuses to create the ', $ufn,' due to some server-side constraint which cannot be satisfied.
',
- '@throws AuthorizationException
',
- ' If the server refuses to create the ', $ufn,' because the client does not have the correct privileges.
',
- '@throws CommunicationException
',
- ' If the client cannot contact the server due to an underlying communication problem.
')" />
+ '@param exceptions
',
+ ' An optional collection in which to place any ',
+ '{@link DefaultBehaviorException}s that occurred whilst ',
+ 'attempting to determine the default values of the ', $ufn,
+ '. This argument can be <code>null<code>.
',
+ '@return Returns a new ', $ufn,' configuration instance.
')" />
</xsl:call-template>
<xsl:value-of
select="concat(' <C extends ', $java-class-name,'CfgClient> C create', $java-relation-name, '(
',
- ' ManagedObjectDefinition<C, ?> d, String name, PropertyProvider p)
',
- ' throws ManagedObjectDecodingException, ManagedObjectAlreadyExistsException,
',
- ' ConcurrentModificationException, OperationRejectedException,
',
- ' AuthorizationException, CommunicationException;
')" />
+ ' ManagedObjectDefinition<C, ?> d, String name, Collection<DefaultBehaviorException> exceptions);
')" />
<xsl:text>
</xsl:text>
<xsl:text>
</xsl:text>
<xsl:text>
</xsl:text>
@@ -382,11 +366,14 @@
<import>java.util.Collection</import>
<import>java.util.SortedSet</import>
</xsl:if>
- <xsl:if test="$this-local-properties[not(@read-only='true')]">
+ <xsl:if test="$this-local-properties[not(@monitoring='true')]">
<import>
org.opends.server.admin.IllegalPropertyValueException
</import>
</xsl:if>
+ <xsl:if test="$this-local-properties[@read-only='true']">
+ <import>org.opends.server.admin.PropertyIsReadOnlyException</import>
+ </xsl:if>
<xsl:if test="$this-local-relations">
<import>
org.opends.server.admin.DefinitionDecodingException
@@ -409,9 +396,9 @@
</xsl:if>
<xsl:if
test="$this-local-relations/adm:one-to-zero-or-one|$this-local-relations/adm:one-to-many">
- <import>org.opends.server.admin.PropertyProvider</import>
+ <import>java.util.Collection</import>
<import>
- org.opends.server.admin.ManagedObjectAlreadyExistsException
+ org.opends.server.admin.DefaultBehaviorException
</import>
<import>
org.opends.server.admin.client.OperationRejectedException
--
Gitblit v1.10.0