[jboss-cvs] JBossAS SVN: r101515 - in trunk/server/src: main/java/org/jboss/naming and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-02-26 00:57:17 -0500 (Fri, 26 Feb 2010)
New Revision: 101515

Modified:
   trunk/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
   trunk/server/src/main/java/org/jboss/naming/NamingProviderURLWriter.java
Log:
[JBAS-7769] NamingProviderURLWriter to support EmbeddedAS servers

Modified: trunk/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
===================================================================
--- trunk/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml	2010-02-26 04:27:57 UTC (rev 101514)
+++ trunk/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml	2010-02-26 05:57:17 UTC (rev 101515)
@@ -31,7 +31,7 @@
    <attribute access="write-only" setMethod="setServer">
        <description>Server object from which the OutputDirURL can be obtained if not directly configured</description>
        <name>Server</name>
-       <type>org.jboss.bootstrap.api.as.server.JBossASServer</type>
+       <type>org.jboss.bootstrap.api.as.server.JBossASBasedServer</type>
    </attribute>
    
    <attribute access="read-write" getMethod="getBootstrapURL" setMethod="setBootstrapURL">

Modified: trunk/server/src/main/java/org/jboss/naming/NamingProviderURLWriter.java
===================================================================
--- trunk/server/src/main/java/org/jboss/naming/NamingProviderURLWriter.java	2010-02-26 04:27:57 UTC (rev 101514)
+++ trunk/server/src/main/java/org/jboss/naming/NamingProviderURLWriter.java	2010-02-26 05:57:17 UTC (rev 101515)
@@ -34,7 +34,7 @@
 import java.net.URI;
 import java.util.Enumeration;
 
-import org.jboss.bootstrap.api.as.server.JBossASServer;
+import org.jboss.bootstrap.api.as.server.JBossASBasedServer;
 import org.jboss.logging.Logger;
 
 /**
@@ -53,7 +53,7 @@
    private String bootstrapUrl;
    private String bindAddress;
    private int port;
-   private JBossASServer server;
+   private JBossASBasedServer<?,?> server;
    private URI outputDir;
    private String filename = DEFAULT_PERSIST_FILE_NAME;
 
@@ -77,7 +77,7 @@
       this.filename = name;
    }
 
-   public void setServer(JBossASServer server)
+   public void setServer(JBossASBasedServer<?,?> server)
    {
       this.server = server;
    }