geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r125372 - /geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml /geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml /geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
Date Sun, 16 Jan 2005 23:02:13 GMT
Author: djencks
Date: Sun Jan 16 15:02:12 2005
New Revision: 125372

URL: http://svn.apache.org/viewcvs?view=rev&rev=125372
Log:
fix some reference object names
Modified:
   geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
   geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
   geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&rev=125372&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r1=125371&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r2=125372
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml	Sun Jan 16 15:02:12 2005
@@ -101,6 +101,10 @@
         <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
     </dependency>
 
+    <dependency>
+         <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
+    </dependency>
+
 
     <!-- Default security realm using properties files -->
     <gbean namePart="properties-login" type="LoginModule"
@@ -120,7 +124,7 @@
         <attribute name="loginModuleConfiguration">
             LoginModule.1.REQUIRED=geronimo.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,name=properties-login
         </attribute>
-        <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+        <reference name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
     </gbean>
 
     <gbean namePart="JMX" type="ConfigurationEntry"
@@ -142,7 +146,7 @@
     </gbean>
 
     <gbean namePart="JaasLoginService" class="org.apache.geronimo.security.jaas.JaasLoginService">
-        <reference name="Realms">geronimo.security:j2eeType=SecurityRealm,*</reference>
+        <reference name="Realms">geronimo.server:j2eeType=SecurityRealm,*</reference>
         <!--        <attribute name="reclaimPeriod" type="long">100000</attribute>-->
         <attribute name="algorithm">HmacSHA1</attribute>
         <attribute name="password">secret</attribute>
@@ -177,7 +181,7 @@
         <attribute name="maxLogFiles">2</attribute>
         <attribute name="minBuffers">4</attribute>
         <attribute name="threadsWaitingForceThreshold">-1</attribute>
-        <reference name="serverInfo">geronimo.system:name=ServerInfo,*</reference>
+        <reference name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
     </gbean>
 
     <gbean namePart="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
@@ -200,7 +204,7 @@
 
     <gbean namePart="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
         <reference name="JettyContainer">geronimo.server:name=JettyWebContainer,*</reference>
-        <reference name="ServerInfo">geronimo.system:name=ServerInfo,*</reference>
+        <reference name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
         <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
         <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
         <attribute name="logTimeZone">GMT</attribute>
@@ -263,7 +267,7 @@
     <!-- JSR77 Management Objects -->
     <gbean name="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
     <gbean name="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <reference name="ServerInfo">geronimo.server:name=ServerInfo</reference>
+        <reference name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
     </gbean>
     <gbean name="geronimo.server:j2eeType=JVM,J2EEServer=geronimo" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
 

Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?view=diff&rev=125372&p1=geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml&r1=125371&p2=geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml&r2=125372
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml	Sun Jan 16 15:02:12
2005
@@ -46,7 +46,7 @@
 
     <!-- message broker -->
     <gbean namePart="ActiveMQJMSServer" class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
-        <reference name="serverInfo">geronimo.system:name=ServerInfo</reference>
+        <reference name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
         <attribute name="brokerName" type="java.lang.String">possibly-unique-broker</attribute>
         <attribute name="dataDirectory" type="java.lang.String">var/activemq</attribute>
   
     </gbean>

Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?view=diff&rev=125372&p1=geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml&r1=125371&p2=geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml&r2=125372
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml	Sun Jan 16 15:02:12
2005
@@ -59,7 +59,7 @@
     </resourceadapter>
 
     <gbean namePart="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="serverInfo">geronimo.system:name=ServerInfo,*</reference>
+        <reference name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
         <attribute name="derbySystemHome" type="java.lang.String">var/derby</attribute>
     </gbean>
     <gbean namePart="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">

Mime
View raw message