incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r924332 - in /incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint: container/ReferenceListRecipe.java ext/ExtNamespaceHandler.java
Date Wed, 17 Mar 2010 15:31:34 GMT
Author: linsun
Date: Wed Mar 17 15:31:29 2010
New Revision: 924332

URL: http://svn.apache.org/viewvc?rev=924332&view=rev
Log:
update ref-list to reference-list and remove outdated ref-set in exception messages

Modified:
    incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java
    incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java?rev=924332&r1=924331&r2=924332&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java
(original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ReferenceListRecipe.java
Wed Mar 17 15:31:29 2010
@@ -215,7 +215,7 @@ public class ReferenceListRecipe extends
         public Object convert(ReifiedType type) {
             LOGGER.debug("Converting ManagedCollection to {}", type);
             if (!type.getRawClass().isAssignableFrom(List.class)) {
-                throw new ComponentDefinitionException("<ref-list/> can only be converted
to a List, not " + type);
+                throw new ComponentDefinitionException("<reference-list/> can only
be converted to a List, not " + type);
             }
             int memberType = metadata.getMemberType();            
             boolean useRef = false;

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java?rev=924332&r1=924331&r2=924332&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
(original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/ExtNamespaceHandler.java
Wed Mar 17 15:31:29 2010
@@ -165,7 +165,7 @@ public class ExtNamespaceHandler impleme
 
     private ComponentMetadata decorateProxyMethod(Node node, ComponentMetadata component,
ParserContext context) {
         if (!(component instanceof ServiceReferenceMetadata)) {
-            throw new ComponentDefinitionException("Attribute " + node.getNodeName() + "
can only be used on a <reference>, <ref-list> or <ref-set> element");
+            throw new ComponentDefinitionException("Attribute " + node.getNodeName() + "
can only be used on a <reference> or <reference-list> element");
         }
         if (!(component instanceof MutableServiceReferenceMetadata)) {
             throw new ComponentDefinitionException("Expected an instance of MutableServiceReferenceMetadata");
@@ -185,7 +185,7 @@ public class ExtNamespaceHandler impleme
             }
         }
         if ((method & ExtendedReferenceListMetadata.PROXY_METHOD_GREEDY) != 0 &&
!(component instanceof ReferenceListMetadata)) {
-            throw new ComponentDefinitionException("Greedy proxying is only available for
<ref-list> and <ref-set> elements");
+            throw new ComponentDefinitionException("Greedy proxying is only available for
<reference-list> element");
         }
         ((MutableServiceReferenceMetadata) component).setProxyMethod(method);
         return component;



Mime
View raw message