geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r290821 - /geronimo/branches/1.0-M5/modules/assembly/src/plan/
Date Wed, 21 Sep 2005 20:23:09 GMT
Author: dain
Date: Wed Sep 21 13:23:05 2005
New Revision: 290821

URL: http://svn.apache.org/viewcvs?rev=290821&view=rev
Log:
Set svn:eol-style=native

Modified:
    geronimo/branches/1.0-M5/modules/assembly/src/plan/client-system-plan.xml   (contents,
props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/directory-server-plan.xml   (props
changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-client-corba-plan.xml   (props
changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-client-plan.xml   (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-jetty-plan.xml   (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
  (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml   (props
changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-security-plan.xml   (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-server-corba-plan.xml   (props
changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-tomcat-plan.xml   (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml
  (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/spring-deployer-plan.xml   (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/spring-runtime-plan.xml   (props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/system-activemq-plan.xml   (contents,
props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/system-database-plan.xml   (contents,
props changed)
    geronimo/branches/1.0-M5/modules/assembly/src/plan/system-jms-plan.xml   (contents, props
changed)

Modified: geronimo/branches/1.0-M5/modules/assembly/src/plan/client-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/plan/client-system-plan.xml?rev=290821&r1=290820&r2=290821&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/plan/client-system-plan.xml Wed Sep 21 13:23:05
2005
@@ -1 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--

    Copyright 2004 The Apache Software
Foundation

    Licensed under the Apache License, Version 2.0 (the "License");
    you may
not use this file except in compliance with the License.
    You may obtain a copy of the
License at
  
       http://www.apache.org/licenses/LICENSE-2.0
  
    Unless required by
applicable law or agreed to in writing, software
    distributed under the License is distributed
on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
    limitations under
the License.
-->
  

<!--
Configuration for the innermost ring of a Geronimo server.
This
configuration should only contain critical services needed to
run other Configurations - for
example, the ServerInfo, Logging
and Repository services used to load them.

This configuration
should *NOT* be used to provide server or application
specific s
 ervices - those should be provided by children.
-->
<configuration
    xmlns="http://geronimo.apache.org/xml/ns/deployment"
   configId="org/apache/geronimo/ClientSystem"
    domain="geronimo.client"
    server="client"
   >

    <!-- ServerInfo service -->
    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>

   <!-- URLFactory service -->
    <gbean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>

   <!-- Configuration Manager service -->
    <gbean name="ConfigurationManager"
class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
        <reference
name="Stores"><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></reference>
   </gbean>

    <!-- User-editable attribute service -->
    <gbean name="AttributeManager"
class="org.apache.geronimo.system.configuration.LocalAttributeManager">
        <reference
name="ServerInfo"><name>ServerInfo</name></reference>
        <attribute
nam
 e="configFile">var/config/config.xml</attribute>
        <!-- The client container
should not alter the saved configuration -->
        <attribute name="readOnly">true</attribute>
   </gbean>

    <!-- Configuration Store service -->
    <gbean name="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
        <attribute
name="root">config-store</attribute>
        <reference name="ServerInfo"><name>ServerInfo</name></reference>
       <reference name="AttributeStore"><name>AttributeManager</name></reference>
   </gbean>

    <!-- Repository -->
    <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
       <attribute name="root">repository/</attribute>
        <reference name="ServerInfo"><name>ServerInfo</name></reference>
   </gbean>

    <!-- Logging service -->
    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
       <attribute name="configFileName">var/log/client-log
 4j.properties</attribute>
        <attribute name="refreshPeriodSeconds">60</attribute>
       <reference name="ServerInfo"><name>ServerInfo</name></reference>
   </gbean>
</configuration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  
+
+<!--
+Configuration for the innermost ring of a Geronimo server.
+This configuration should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This configuration should *NOT* be used to provide server or application
+specific services - those should be provided by children.
+-->
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    configId="org/apache/geronimo/ClientSystem"
+    domain="geronimo.client"
+    server="client"
+    >
+
+    <!-- ServerInfo service -->
+    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+
+    <!-- URLFactory service -->
+    <gbean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
+
+    <!-- Configuration Manager service -->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
+        <reference name="Stores"><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></reference>
+    </gbean>
+
+    <!-- User-editable attribute service -->
+    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <attribute name="configFile">var/config/config.xml</attribute>
+        <!-- The client container should not alter the saved configuration -->
+        <attribute name="readOnly">true</attribute>
+    </gbean>
+
+    <!-- Configuration Store service -->
+    <gbean name="Local" class="org.apache.geronimo.system.configuration.LocalConfigStore">
+        <attribute name="root">config-store</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <reference name="AttributeStore"><name>AttributeManager</name></reference>
+    </gbean>
+
+    <!-- Repository -->
+    <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+        <attribute name="root">repository/</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
+    <!-- Logging service -->
+    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+        <attribute name="configFileName">var/log/client-log4j.properties</attribute>
+        <attribute name="refreshPeriodSeconds">60</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+</configuration>
\ No newline at end of file

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/client-system-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/directory-server-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-client-corba-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-client-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-jetty-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-security-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-server-corba-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-tomcat-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/spring-deployer-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/spring-runtime-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.0-M5/modules/assembly/src/plan/system-activemq-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/plan/system-activemq-plan.xml?rev=290821&r1=290820&r2=290821&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/plan/system-activemq-plan.xml Wed Sep 21
13:23:05 2005
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2004 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-
-<configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    configId="org/apache/geronimo/ActiveMQServer"
-    parentId="org/apache/geronimo/SystemDatabase">
-
-    <dependency>
-        <uri>activemq/jars/activemq-core-${activemq_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>activemq/jars/activemq-gbean-${activemq_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
-    </dependency>
-
-    <!-- management -->
-    <gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean"
/>
-
-    <!-- message broker -->
-    <gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">
-        <attribute name="brokerName">possibly-unique-broker</attribute>
-        <reference name="persistenceAdapter"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</gbean-name></reference>
-<!--        <reference name="ConnectorCollection"><gbean-name>geronimo.server:j2eeType=JMSConnector,broker=ActiveMQ,*</gbean-name></reference>-->
-    </gbean>
-
-    <gbean name="ActiveMQ.cache" class="org.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
-        <attribute name="cacheSize">10000</attribute>
-        <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</gbean-name></reference>
-    </gbean>
-
-    <gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
-        <!--TODO change to ServerInfo -->
-        <reference name="serverInfo"><module>org/apache/geronimo/System</module><type>GBean</type><name>ServerInfo</name></reference>
-        <attribute name="directory">var/activemq/journal</attribute>
-        <attribute name="journalType">default</attribute>
-        <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</gbean-name></reference>
-    </gbean>
-
-    <gbean name="ActiveMQ.jdbc" class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
-        <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
-    </gbean>
-
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default"
class="org.activemq.gbean.ActiveMQConnectorGBean">
-        <attribute name="protocol">tcp</attribute>
-        <attribute name="host">${PlanServerHostname}</attribute>
-        <attribute name="port">${PlanActiveMQPort}</attribute>
-        <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
-    </gbean>
-
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.vm.localhost"
class="org.activemq.gbean.ActiveMQConnectorGBean">
-        <attribute name="protocol">vm</attribute>
-        <attribute name="host">localhost</attribute>
-        <attribute name="port">-1</attribute>
-        <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
-    </gbean>
-
-</configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    configId="org/apache/geronimo/ActiveMQServer"
+    parentId="org/apache/geronimo/SystemDatabase">
+
+    <dependency>
+        <uri>activemq/jars/activemq-core-${activemq_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>activemq/jars/activemq-gbean-${activemq_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
+    </dependency>
+
+    <!-- management -->
+    <gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean"
/>
+
+    <!-- message broker -->
+    <gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">
+        <attribute name="brokerName">possibly-unique-broker</attribute>
+        <reference name="persistenceAdapter"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</gbean-name></reference>
+<!--        <reference name="ConnectorCollection"><gbean-name>geronimo.server:j2eeType=JMSConnector,broker=ActiveMQ,*</gbean-name></reference>-->
+    </gbean>
+
+    <gbean name="ActiveMQ.cache" class="org.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
+        <attribute name="cacheSize">10000</attribute>
+        <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</gbean-name></reference>
+    </gbean>
+
+    <gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
+        <!--TODO change to ServerInfo -->
+        <reference name="serverInfo"><module>org/apache/geronimo/System</module><type>GBean</type><name>ServerInfo</name></reference>
+        <attribute name="directory">var/activemq/journal</attribute>
+        <attribute name="journalType">default</attribute>
+        <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</gbean-name></reference>
+    </gbean>
+
+    <gbean name="ActiveMQ.jdbc" class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
+        <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
+    </gbean>
+
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default"
class="org.activemq.gbean.ActiveMQConnectorGBean">
+        <attribute name="protocol">tcp</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanActiveMQPort}</attribute>
+        <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
+    </gbean>
+
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.vm.localhost"
class="org.activemq.gbean.ActiveMQConnectorGBean">
+        <attribute name="protocol">vm</attribute>
+        <attribute name="host">localhost</attribute>
+        <attribute name="port">-1</attribute>
+        <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
+    </gbean>
+
+</configuration>

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/system-activemq-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.0-M5/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/plan/system-database-plan.xml?rev=290821&r1=290820&r2=290821&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/plan/system-database-plan.xml Wed Sep 21
13:23:05 2005
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2004 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
-    configId="org/apache/geronimo/SystemDatabase"
-    parentId="org/apache/geronimo/Server">
-
-    <resourceadapter>
-        <outbound-resourceadapter>
-            <connection-definition>
-                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-                <connectiondefinition-instance>
-                    <name>SystemDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
-                    <connectionmanager>
-                        <xa-transaction>
-                            <transaction-caching/>
-                        </xa-transaction>
-                        <single-pool>
-                            <max-size>100</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <match-one/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-            </connection-definition>
-        </outbound-resourceadapter>
-    </resourceadapter>
-
-    <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
-        <attribute name="derbySystemHome">var/derby</attribute>
-    </gbean>
-    <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are
in -->
-        <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-        <attribute name="host">${PlanServerHostname}</attribute>
-        <attribute name="port">${PlanDerbyPort}</attribute>
-    </gbean>
-
-    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-        <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are
in -->
-        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-    </gbean>
-
-    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are
in -->
-        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-    </gbean>
-
-</connector>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+    configId="org/apache/geronimo/SystemDatabase"
+    parentId="org/apache/geronimo/Server">
+
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>SystemDatasource</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+    <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
+        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+        <attribute name="derbySystemHome">var/derby</attribute>
+    </gbean>
+    <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
+        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are
in -->
+        <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanDerbyPort}</attribute>
+    </gbean>
+
+    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
+        <attribute name="repeatCount">5</attribute>
+        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
+        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
+        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
+        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are
in -->
+        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+    </gbean>
+
+    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
+        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
+        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
+        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
+        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are
in -->
+        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+    </gbean>
+
+</connector>

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/system-database-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.0-M5/modules/assembly/src/plan/system-jms-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/assembly/src/plan/system-jms-plan.xml?rev=290821&r1=290820&r2=290821&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/assembly/src/plan/system-jms-plan.xml (original)
+++ geronimo/branches/1.0-M5/modules/assembly/src/plan/system-jms-plan.xml Wed Sep 21 13:23:05
2005
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2004 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
-    configId="org/apache/geronimo/SystemJMS"
-    parentId="org/apache/geronimo/ActiveMQServer">
-    <resourceadapter>
-        <resourceadapter-instance>
-            <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
-            <config-property-setting name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort}</config-property-setting>
-            <config-property-setting name="UserName">geronimo</config-property-setting>
-            <config-property-setting name="Password">geronimo</config-property-setting>
-            <workmanager>
-                <gbean-link>DefaultWorkManager</gbean-link>
-            </workmanager>
-        </resourceadapter-instance>
-        <outbound-resourceadapter>
-            <connection-definition>
-                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                <connectiondefinition-instance>
-                    <name>DefaultActiveMQConnectionFactory</name>
-                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                    <connectionmanager>
-                        <xa-transaction>
-                            <transaction-caching/>
-                        </xa-transaction>
-                        <single-pool>
-                            <max-size>10</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <match-one/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-            </connection-definition>
-        </outbound-resourceadapter>
-    </resourceadapter>
-    <adminobject>
-        <adminobject-interface>javax.jms.Queue</adminobject-interface>
-        <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
-        <adminobject-instance>
-            <message-destination-name>MDBTransferBeanOutQueue</message-destination-name>
-            <config-property-setting name="PhysicalName">MDBTransferBeanOutQueue</config-property-setting>
-        </adminobject-instance>
-    </adminobject>
-    <adminobject>
-        <adminobject-interface>javax.jms.Queue</adminobject-interface>
-        <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
-        <adminobject-instance>
-            <message-destination-name>SendReceiveQueue</message-destination-name>
-            <config-property-setting name="PhysicalName">SendReceiveQueue</config-property-setting>
-        </adminobject-instance>
-    </adminobject>
-
-</connector>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+    configId="org/apache/geronimo/SystemJMS"
+    parentId="org/apache/geronimo/ActiveMQServer">
+    <resourceadapter>
+        <resourceadapter-instance>
+            <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
+            <config-property-setting name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort}</config-property-setting>
+            <config-property-setting name="UserName">geronimo</config-property-setting>
+            <config-property-setting name="Password">geronimo</config-property-setting>
+            <workmanager>
+                <gbean-link>DefaultWorkManager</gbean-link>
+            </workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>DefaultActiveMQConnectionFactory</name>
+                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>10</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+    <adminobject>
+        <adminobject-interface>javax.jms.Queue</adminobject-interface>
+        <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>MDBTransferBeanOutQueue</message-destination-name>
+            <config-property-setting name="PhysicalName">MDBTransferBeanOutQueue</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
+    <adminobject>
+        <adminobject-interface>javax.jms.Queue</adminobject-interface>
+        <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>SendReceiveQueue</message-destination-name>
+            <config-property-setting name="PhysicalName">SendReceiveQueue</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
+
+</connector>

Propchange: geronimo/branches/1.0-M5/modules/assembly/src/plan/system-jms-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message