donaldp 2002/10/01 08:39:46
Modified: src/java/org/apache/avalon/phoenix/metainfo
ServiceDescriptor.java
src/test/org/apache/avalon/phoenix/components/application/test
assembly3.xml
src/test/org/apache/avalon/phoenix/test/data Component4.java
Component4.xinfo
Log:
# --> {}
Revision Changes Path
1.14 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java
Index: ServiceDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ServiceDescriptor.java 1 Oct 2002 07:04:05 -0000 1.13
+++ ServiceDescriptor.java 1 Oct 2002 15:39:45 -0000 1.14
@@ -19,7 +19,7 @@
public final class ServiceDescriptor
{
public static final String ARRAY_POSTFIX = "[]";
- public static final String MAP_POSTFIX = "#";
+ public static final String MAP_POSTFIX = "{}";
private final Version m_version;
private final String m_name;
1.3 +3 -3
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/assembly3.xml
Index: assembly3.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/assembly3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- assembly3.xml 1 Oct 2002 07:44:01 -0000 1.2
+++ assembly3.xml 1 Oct 2002 15:39:45 -0000 1.3
@@ -16,12 +16,12 @@
<block class="org.apache.avalon.phoenix.test.data.Component4"
name="c3">
<provide name="c2a"
- role="org.apache.avalon.phoenix.test.data.Service2#"/>
+ role="org.apache.avalon.phoenix.test.data.Service2{}"/>
<provide name="c2b"
- role="org.apache.avalon.phoenix.test.data.Service2#"/>
+ role="org.apache.avalon.phoenix.test.data.Service2{}"/>
<provide name="c2c"
alias="fred"
- role="org.apache.avalon.phoenix.test.data.Service2#"/>
+ role="org.apache.avalon.phoenix.test.data.Service2{}"/>
</block>
</assembly>
1.3 +2 -2
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component4.java
Index: Component4.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component4.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Component4.java 1 Oct 2002 07:50:56 -0000 1.2
+++ Component4.java 1 Oct 2002 15:39:45 -0000 1.3
@@ -26,7 +26,7 @@
throws ServiceException
{
final Map services =
- (Map)manager.lookup( Service2.ROLE + "#" );
+ (Map)manager.lookup( Service2.ROLE + "{}" );
System.out.println( "Passed the following services: " +
services );
1.2 +1 -1
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component4.xinfo
Index: Component4.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/test/data/Component4.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Component4.xinfo 1 Oct 2002 07:30:25 -0000 1.1
+++ Component4.xinfo 1 Oct 2002 15:39:45 -0000 1.2
@@ -12,7 +12,7 @@
<!-- services that are required by this block -->
<dependencies>
<dependency>
- <service name="org.apache.avalon.phoenix.test.data.Service2#"/>
+ <service name="org.apache.avalon.phoenix.test.data.Service2{}"/>
</dependency>
</dependencies>
</blockinfo>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
