You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2010/09/22 08:23:06 UTC
svn commit: r999771 - in
/incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi:
JNDIContextManager.java JNDIProviderAdmin.java
Author: not
Date: Wed Sep 22 06:23:06 2010
New Revision: 999771
URL: http://svn.apache.org/viewvc?rev=999771&view=rev
Log:
ARIES-417 Add generics to the API. For now I'm going with <?,?> which isn't that great, but it replicates the JNDI layer. Shout if you have a better idea.
Modified:
incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java
incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java
Modified: incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java?rev=999771&r1=999770&r2=999771&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java (original)
+++ incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIContextManager.java Wed Sep 22 06:23:06 2010
@@ -52,7 +52,7 @@ public interface JNDIContextManager {
* @throws NamingException upon any error that occurs during context
* creation
*/
- public Context newInitialContext(Map environment) throws NamingException;
+ public Context newInitialContext(Map<?,?> environment) throws NamingException;
/**
* Creates a new initial DirContext with the default JNDI environment
@@ -73,6 +73,6 @@ public interface JNDIContextManager {
* @throws NamingException upon any error that occurs during context
* creation
*/
- public DirContext newInitialDirContext(Map environment)
+ public DirContext newInitialDirContext(Map<?,?> environment)
throws NamingException;
}
Modified: incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java?rev=999771&r1=999770&r2=999771&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java (original)
+++ incubator/aries/trunk/jndi/jndi-api/src/main/java/org/osgi/service/jndi/JNDIProviderAdmin.java Wed Sep 22 06:23:06 2010
@@ -53,7 +53,7 @@ public interface JNDIProviderAdmin {
* resolve the JNDI reference.
*/
public Object getObjectInstance(Object refInfo, Name name, Context context,
- Map environment) throws Exception;
+ Map<?,?> environment) throws Exception;
/**
* Resolve the object from the given reference.
@@ -69,5 +69,5 @@ public interface JNDIProviderAdmin {
* resolve the JNDI reference.
*/
public Object getObjectInstance(Object refInfo, Name name, Context context,
- Map environment, Attributes attributes) throws Exception;
+ Map<?,?> environment, Attributes attributes) throws Exception;
}
\ No newline at end of file