djencks 2004/07/14 23:34:20
Modified: modules/assembly/src/plan deployer-system-plan.xml
j2ee-deployer-plan.xml j2ee-server-plan.xml
system-plan.xml
Log:
attribute/reference name case fixes
Revision Changes Path
1.3 +15 -15 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deployer-system-plan.xml 25 Jun 2004 20:48:51 -0000 1.2
+++ deployer-system-plan.xml 15 Jul 2004 03:34:20 -0000 1.3
@@ -6,16 +6,16 @@
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 system layer of the Geronimo deployer
@@ -39,7 +39,7 @@
<!-- Repository -->
<gbean name="geronimo.deployment:role=Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
- <attribute name="Root" type="java.net.URI">repository/</attribute>
+ <attribute name="root" type="java.net.URI">repository/</attribute>
<reference name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
</gbean>
@@ -52,20 +52,20 @@
</gbean>
<gbean name="geronimo.deployments:role=LogAppender,type=ConsoleAppender"
class="org.apache.geronimo.system.logging.log4j.appender.ConsoleAppenderService">
- <attribute name="Threshold" type="java.lang.String">ERROR</attribute>
- <attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
- <attribute name="Target" type="java.lang.String">System.out</attribute>
+ <attribute name="threshold" type="java.lang.String">ERROR</attribute>
+ <attribute name="layoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
+ <attribute name="target" type="java.lang.String">System.out</attribute>
</gbean>
<gbean
name="geronimo.deployment:role=LogAppender,type=DailyRollingFileAppender"
class="org.apache.geronimo.system.logging.log4j.appender.RollingFileAppenderService">
- <attribute name="Threshold" type="java.lang.String">DEBUG</attribute>
- <attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
- <attribute name="Append" type="boolean">true</attribute>
- <attribute name="File"
type="java.lang.String">var/log/deployer.log</attribute>
- <attribute name="BufferedIO" type="boolean">false</attribute>
- <attribute name="BufferedSize" type="int">8192</attribute>
- <attribute name="MaxBackupIndex" type="int">1</attribute>
- <attribute name="MaxFileSize" type="java.lang.String">10MB</attribute>
+ <attribute name="threshold" type="java.lang.String">DEBUG</attribute>
+ <attribute name="layoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
+ <attribute name="append" type="boolean">true</attribute>
+ <attribute name="file"
type="java.lang.String">var/log/deployer.log</attribute>
+ <attribute name="bufferedIO" type="boolean">false</attribute>
+ <attribute name="bufferedSize" type="int">8192</attribute>
+ <attribute name="maxBackupIndex" type="int">1</attribute>
+ <attribute name="maxFileSize" type="java.lang.String">10MB</attribute>
<reference name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
</gbean>
</configuration>
1.15 +8 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- j2ee-deployer-plan.xml 24 Jun 2004 20:58:05 -0000 1.14
+++ j2ee-deployer-plan.xml 15 Jul 2004 03:34:20 -0000 1.15
@@ -36,6 +36,10 @@
<dependency>
<uri>geronimo/jars/geronimo-core-1.0-SNAPSHOT.jar</uri>
</dependency>
+ <!-- needed to load some connector and core classes-->
+ <dependency>
+ <uri>concurrent/jars/concurrent-1.3.4.jar</uri>
+ </dependency>
<dependency>
<uri>geronimo/jars/geronimo-j2ee-1.0-SNAPSHOT.jar</uri>
</dependency>
@@ -53,6 +57,10 @@
</dependency>
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc2.jar</uri>
+ </dependency>
+ <!-- required for rar 1.5 to load realms -->
+ <dependency>
+ <uri>regexp/jars/regexp-1.3.jar</uri>
</dependency>
<dependency>
<uri>tranql/jars/tranql-1.0-SNAPSHOT.jar</uri>
1.18 +17 -18 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- j2ee-server-plan.xml 6 Jul 2004 17:21:42 -0000 1.17
+++ j2ee-server-plan.xml 15 Jul 2004 03:34:20 -0000 1.18
@@ -42,7 +42,7 @@
<uri>geronimo/jars/geronimo-connector-1.0-SNAPSHOT.jar</uri>
</dependency>
<dependency>
- <uri>concurrent/jars/concurrent-1.3.2.jar</uri>
+ <uri>concurrent/jars/concurrent-1.3.4.jar</uri>
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-transaction-1.0-SNAPSHOT.jar</uri>
@@ -63,19 +63,19 @@
<uri>howl/jars/howl-logger-0.1.3.jar</uri>
</dependency>
- <gbean name="geronimo.server:type=ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
- </gbean>
+ <!-- required for rar 1.5 to load realms -->
+ <dependency>
+ <uri>regexp/jars/regexp-1.3.jar</uri>
+ </dependency>
- <gbean name="geronimo.server:type=WorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
- <attribute name="SyncMaximumPoolSize" type="int">10</attribute>
- <attribute name="StartMaximumPoolSize" type="int">10</attribute>
- <attribute name="ScheduledMaximumPoolSize" type="int">10</attribute>
- <reference name="XAWork">geronimo.server:type=TransactionManager</reference>
+ <gbean name="geronimo.server:type=ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
- <gbean name="geronimo.server:type=BootstrapContext"
class="org.apache.geronimo.connector.BootstrapContext">
- <reference
name="WorkManager">geronimo.connector:service=WorkManager</reference>
- <reference
name="XATerminator">geronimo.server:type=TransactionManager</reference>
+ <gbean name="geronimo.server:type=WorkManager,name=DefaultWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
+ <attribute name="syncMaximumPoolSize" type="int">10</attribute>
+ <attribute name="startMaximumPoolSize" type="int">10</attribute>
+ <attribute name="scheduledMaximumPoolSize" type="int">10</attribute>
+ <reference
name="XAServices">geronimo.server:type=TransactionManager</reference>
</gbean>
<gbean name="geronimo.server:type=HOWLTransactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
@@ -92,12 +92,11 @@
<attribute name="minBuffers" type="int">4</attribute>
<attribute name="threadsWaitingForceThreshold" type="int">-1</attribute>
<reference name="serverInfo">geronimo.system:role=ServerInfo</reference>
-
</gbean>
<gbean name="geronimo.server:type=TransactionManager"
class="org.apache.geronimo.transaction.GeronimoTransactionManager">
- <reference
name="transactionLog">geronimo.server:type=HOWLTransactionLog</reference>
- <references name="resourceManagers">
+ <reference
name="TransactionLog">geronimo.server:type=HOWLTransactionLog</reference>
+ <references name="ResourceManagers">
<pattern>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
<pattern>geronimo.server:j2eeType=ActivationSpec,*</pattern>
</references>
@@ -113,13 +112,13 @@
<!-- EJB Protocol -->
<gbean name="openejb:type=SocketService,name=EJB"
class="org.openejb.server.SimpleSocketService">
- <attribute name="ServiceClassName"
type="java.lang.String">org.openejb.server.ejbd.EjbServer</attribute>
- <attribute name="OnlyFrom"
type="java.net.InetAddress[]">127.0.0.1</attribute>
+ <attribute name="serviceClassName"
type="java.lang.String">org.openejb.server.ejbd.EjbServer</attribute>
+ <attribute name="onlyFrom"
type="java.net.InetAddress[]">127.0.0.1</attribute>
<reference name="ContainerIndex">openejb:type=ContainerIndex</reference>
</gbean>
<gbean name="openejb:type=ServiceDaemon,name=EJB"
class="org.openejb.server.ServiceDaemon">
- <attribute name="Port" type="int">4201</attribute>
- <attribute name="InetAddress"
type="java.net.InetAddress">127.0.0.1</attribute>
+ <attribute name="port" type="int">4201</attribute>
+ <attribute name="inetAddress"
type="java.net.InetAddress">127.0.0.1</attribute>
<reference
name="SocketService">openejb:type=SocketService,name=EJB</reference>
</gbean>
1.6 +15 -15 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-plan.xml 25 Jun 2004 20:48:51 -0000 1.5
+++ system-plan.xml 15 Jul 2004 03:34:20 -0000 1.6
@@ -6,16 +6,16 @@
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.
@@ -45,7 +45,7 @@
<!-- Repository -->
<gbean name="geronimo.system:role=Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
- <attribute name="Root" type="java.net.URI">repository/</attribute>
+ <attribute name="root" type="java.net.URI">repository/</attribute>
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
</gbean>
@@ -58,20 +58,20 @@
</gbean>
<gbean name="geronimo.system:role=LogAppender,type=ConsoleAppender"
class="org.apache.geronimo.system.logging.log4j.appender.ConsoleAppenderService">
- <attribute name="Threshold" type="java.lang.String">INFO</attribute>
- <attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
- <attribute name="Target" type="java.lang.String">System.out</attribute>
+ <attribute name="threshold" type="java.lang.String">INFO</attribute>
+ <attribute name="layoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
+ <attribute name="target" type="java.lang.String">System.out</attribute>
</gbean>
<gbean name="geronimo.system:role=LogAppender,type=DailyRollingFileAppender"
class="org.apache.geronimo.system.logging.log4j.appender.RollingFileAppenderService">
- <attribute name="Threshold" type="java.lang.String">DEBUG</attribute>
- <attribute name="LayoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
- <attribute name="Append" type="boolean">true</attribute>
- <attribute name="File"
type="java.lang.String">var/log/geronimo.log</attribute>
- <attribute name="BufferedIO" type="boolean">false</attribute>
- <attribute name="BufferedSize" type="int">8192</attribute>
- <attribute name="MaxBackupIndex" type="int">1</attribute>
- <attribute name="MaxFileSize" type="java.lang.String">10MB</attribute>
+ <attribute name="threshold" type="java.lang.String">DEBUG</attribute>
+ <attribute name="layoutPattern" type="java.lang.String">%d{ABSOLUTE} %-5p
[%c{1}] %m%n</attribute>
+ <attribute name="append" type="boolean">true</attribute>
+ <attribute name="file"
type="java.lang.String">var/log/geronimo.log</attribute>
+ <attribute name="bufferedIO" type="boolean">false</attribute>
+ <attribute name="bufferedSize" type="int">8192</attribute>
+ <attribute name="maxBackupIndex" type="int">1</attribute>
+ <attribute name="maxFileSize" type="java.lang.String">10MB</attribute>
<reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
</gbean>
</configuration>
