ammulder 2005/08/18 14:15:59
Modified: modules/assembly/src/plan deployer-system-plan.xml
j2ee-deployer-plan.xml j2ee-server-plan.xml
system-plan.xml
Log:
Sync with Geronimo changes
- ServerInfo now an interface
- Moved management API interfaces to a new module
Revision Changes Path
1.12 +1 -1
openejb/modules/assembly/src/plan/deployer-system-plan.xml
Index: deployer-system-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/deployer-system-plan.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- deployer-system-plan.xml 24 Jul 2005 21:19:31 -0000 1.11
+++ deployer-system-plan.xml 18 Aug 2005 18:15:59 -0000 1.12
@@ -29,7 +29,7 @@
>
<!-- ServerInfo service -->
- <gbean name="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo">
+ <gbean name="ServerInfo"
class="org.apache.geronimo.system.serverinfo.BasicServerInfo">
</gbean>
<!-- Configuration Store service -->
1.49 +3 -0 openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- j2ee-deployer-plan.xml 10 Aug 2005 02:24:56 -0000 1.48
+++ j2ee-deployer-plan.xml 18 Aug 2005 18:15:59 -0000 1.49
@@ -78,6 +78,9 @@
<uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
</dependency>
<dependency>
1.97 +3 -0 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- j2ee-server-plan.xml 11 Aug 2005 01:46:12 -0000 1.96
+++ j2ee-server-plan.xml 18 Aug 2005 18:15:59 -0000 1.97
@@ -70,6 +70,9 @@
<uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
</dependency>
<dependency>
1.18 +1 -1 openejb/modules/assembly/src/plan/system-plan.xml
Index: system-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/system-plan.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- system-plan.xml 24 Jul 2005 21:19:31 -0000 1.17
+++ system-plan.xml 18 Aug 2005 18:15:59 -0000 1.18
@@ -34,7 +34,7 @@
>
<!-- ServerInfo service -->
- <gbean name="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+ <gbean name="ServerInfo"
class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
<!-- URLFactory service -->
<gbean name="URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
