You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/20 03:30:10 UTC
svn commit: r432923 - in /geronimo/trunk/configs: activemq-broker/src/plan/
activemq/src/plan/ axis-deployer/src/plan/ axis/src/plan/
client-corba/src/plan/ client-deployer/src/plan/ client-security/src/plan/
client-system/src/plan/ client/src/plan/ co...
Author: jdillon
Date: Sat Aug 19 18:30:07 2006
New Revision: 432923
URL: http://svn.apache.org/viewvc?rev=432923&view=rev
Log:
Cleaned up plan files, indent + copyrights
Modified:
geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
geronimo/trunk/configs/activemq/src/plan/plan.xml
geronimo/trunk/configs/axis-deployer/src/plan/plan.xml
geronimo/trunk/configs/axis/src/plan/plan.xml
geronimo/trunk/configs/client-corba/src/plan/plan.xml
geronimo/trunk/configs/client-deployer/src/plan/plan.xml
geronimo/trunk/configs/client-security/src/plan/plan.xml
geronimo/trunk/configs/client-system/src/plan/plan.xml
geronimo/trunk/configs/client/src/plan/plan.xml
geronimo/trunk/configs/console-jetty/src/plan/plan.xml
geronimo/trunk/configs/console-tomcat/src/plan/plan.xml
geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
geronimo/trunk/configs/directory/src/plan/plan.xml
geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
geronimo/trunk/configs/hot-deployer/src/plan/plan.xml
geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
geronimo/trunk/configs/javamail/src/plan/plan.xml
geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
geronimo/trunk/configs/jetty/src/plan/plan.xml
geronimo/trunk/configs/jsp-examples-jetty/src/plan/plan.xml
geronimo/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml
geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml
geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml
geronimo/trunk/configs/ldap-realm/src/plan/plan.xml
geronimo/trunk/configs/online-deployer/src/plan/plan.xml
geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
geronimo/trunk/configs/openejb/src/plan/plan.xml
geronimo/trunk/configs/remote-deploy-jetty/src/plan/plan.xml
geronimo/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml
geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
geronimo/trunk/configs/servlets-examples-jetty/src/plan/plan.xml
geronimo/trunk/configs/servlets-examples-tomcat/src/plan/plan.xml
geronimo/trunk/configs/sharedlib/src/plan/plan.xml
geronimo/trunk/configs/shutdown/src/plan/plan.xml
geronimo/trunk/configs/system-database/src/plan/plan.xml
geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
geronimo/trunk/configs/tomcat/src/plan/plan.xml
geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
geronimo/trunk/configs/unavailable-client-deployer/src/plan/plan.xml
geronimo/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml
geronimo/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml
geronimo/trunk/configs/upgrade-cli/src/plan/plan.xml
geronimo/trunk/configs/upgrade/src/plan/plan.xml
geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml
geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml
Modified: geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq-broker/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq-broker/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,15 +16,11 @@
-->
<!-- $Rev$ $Date$ -->
-<!-- parentId="${pom.groupId}/system-database/${pom.version}/car"
--->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <!-- management -->
- <gbean name="ActiveMQManager" class="org.activemq.gbean.management.ActiveMQManagerGBean" />
+ <gbean name="ActiveMQManager" 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">
@@ -47,7 +42,6 @@
</gbean>
<gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
- <!--TODO change to ServerInfo -->
<reference name="serverInfo">
<name>ServerInfo</name>
</reference>
Modified: geronimo/trunk/configs/activemq/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,8 @@
<!-- $Rev$ $Date$ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
- >
<resourceadapter>
<resourceadapter-instance>
<resourceadapter-name>ActiveMQ RA</resourceadapter-name>
Modified: geronimo/trunk/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/axis-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +15,7 @@
limitations under the License.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
Modified: geronimo/trunk/configs/axis/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/axis/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/axis/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,18 +17,7 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the main ring of a Geronimo server.
-
-This module should contain those services normally provided
-by the server.
- parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
-
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
Modified: geronimo/trunk/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-corba/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +17,8 @@
<!-- $Rev$ $Date$ -->
-<!--
-CSSBean examples for app client
--->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
<gbean name="CORBASystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
<attribute name="systemProperties">
javax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl
@@ -174,4 +171,5 @@
</xml-attribute>
</gbean>
-->
+
</module>
Modified: geronimo/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +15,7 @@
limitations under the License.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
<attribute name="transactionManagerObjectName">?name=TransactionManager</attribute>
@@ -58,7 +55,6 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>j2ee-server</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
</dependencies>
@@ -70,7 +66,6 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>client</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/trunk/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-security/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-security/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,14 +17,7 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the security of a Geronimo app client.
-
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
- >
-
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- required -->
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
@@ -107,6 +99,5 @@
<attribute name="algorithm">HmacSHA1</attribute>
<attribute name="password">secret</attribute>
</gbean>
-
</module>
Modified: geronimo/trunk/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-system/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-system/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +15,8 @@
limitations under the License.
-->
-
-<!--
-Configuration for root app client
--->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
<!-- ServerInfo service -->
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
Modified: geronimo/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,13 +17,6 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the main ring of a Geronimo app client.
-
-This module should contain those services normally provided
-by the app client.
- parentId="${pom.groupId}/client-system/${pom.version}/car"
--->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- Naming properties -->
Modified: geronimo/trunk/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
Modified: geronimo/trunk/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
Modified: geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2004-2005 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$ $Date$ -->
+
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<module>
Modified: geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2004-2005 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$ $Date$ -->
+
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<module>
Modified: geronimo/trunk/configs/directory/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/directory/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/directory/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/directory/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,16 +17,7 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the main ring of a Geronimo server.
-
-This module should contain those services normally provided
-by the server.
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="DirectoryService" class="org.apache.geronimo.directory.DirectoryGBean">
<attribute name="providerURL">ou=system</attribute>
Modified: geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
-->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
<!-- Deployer used to process modules and plans -->
<gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
<reference name="Store">
Modified: geronimo/trunk/configs/hot-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/hot-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/hot-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/hot-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,31 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+ Copyright 2004-2005 The Apache Software Foundation
-Copyright 2004-2005 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.
+ 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$ $Date$ -->
-<!--
-Child of the geronimo/j2ee-server/${pom.version}/car module that includes deployment services
- parentId="geronimo/runtime-deployer/${pom.version}/car"
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- >
<gbean name="HotDeployer" class="org.apache.geronimo.deployment.hot.DirectoryHotDeployer">
<reference name="ServerInfo">
<name>ServerInfo</name>
@@ -39,4 +32,5 @@
<name>EARBuilder</name>
</dependency>
</gbean>
+
</module>
Modified: geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,6 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for corba on a Geronimo server, including client and target security examples.
--->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="CORBASystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
@@ -42,7 +38,6 @@
<name>ServerInfo</name>
</reference>
</gbean>
-
<!-- CORBA -->
<gbean name="DynamicORBStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoaderGBean">
Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
-->
<!-- $Rev$ $Date$ -->
+
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
@@ -82,7 +82,6 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>j2ee-server</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
</dependencies>
@@ -119,7 +118,6 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>j2ee-server</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-security/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-security/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,23 +17,15 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the security of a Geronimo server.
- parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- >
<!--runtime dependencies-->
-
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
<reference name="ServerInfo"><name>ServerInfo</name></reference>
<attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
<attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
</gbean>
-
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
<gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
<references name="Configurations">
@@ -91,6 +82,7 @@
<reference name="ServerInfo"><name>ServerInfo</name></reference>
<reference name="LoginService"><name>JaasLoginService</name></reference>
</gbean>
+
<gbean name="properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
<attribute name="controlFlag">REQUIRED</attribute>
<reference name="LoginModule">
@@ -113,6 +105,7 @@
</pattern>
</references>
</gbean>
+
<gbean name="geronimo-default" class="org.apache.geronimo.security.keystore.FileKeystoreInstance">
<attribute name="keystoreName">geronimo-default</attribute>
<attribute name="keystorePath">var/security/keystores/geronimo-default</attribute>
@@ -120,4 +113,5 @@
<attribute name="keyPasswords">geronimo=secret</attribute>
<reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
+
</module>
Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,14 +17,6 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the main ring of a Geronimo server.
-
-This module should contain those services normally provided
-by the server.
- parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
-
--->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
Modified: geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-system/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-system/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +15,6 @@
limitations under the License.
-->
-
<!--
Configuration for the innermost ring of a Geronimo server.
This module should only contain critical services needed to
@@ -26,75 +24,74 @@
This module should *NOT* be used to provide server or application
specific services - those should be provided by children.
-->
+
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
- <!--Repository-->
- <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
- <attribute name="root">repository/</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
- <!--Configuration Store service-->
- <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</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>
- </gbean>
-
- <!-- ArtifactManager -->
- <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
-
- <!-- ArtifactResolver -->
- <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="Repositories">
- <!--<gbean-name>*:name=Repository,*</gbean-name>-->
- </reference>
- </gbean>
-
- <!--Configuration Manager service-->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
- <reference name="Repositories">
- </reference>
- <reference name="Stores">
- </reference>
- <reference name="Watchers">
- </reference>
- <reference name="AttributeStore">
- <name>AttributeManager</name>
- </reference>
- <reference name="PersistentConfigurationList">
- <type>AttributeStore</type>
- <name>AttributeManager</name>
- </reference>
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="ArtifactResolver">
- <name>ArtifactResolver</name>
- </reference>
- </gbean>
-
- <!-- Logging service -->
- <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configFileName">var/log/server-log4j.properties</attribute>
- <attribute name="refreshPeriodSeconds">60</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
+ <!-- ServerInfo service -->
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+
+ <!--Repository-->
+ <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+ <attribute name="root">repository/</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+
+ <!--Configuration Store service-->
+ <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+ <reference name="Repository">
+ <name>Repository</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>
+ </gbean>
+
+ <!-- ArtifactManager -->
+ <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+
+ <!-- ArtifactResolver -->
+ <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="Repositories">
+ <!--<gbean-name>*:name=Repository,*</gbean-name>--></reference>
+ </gbean>
+
+ <!--Configuration Manager service-->
+ <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+ <reference name="Repositories"></reference>
+ <reference name="Stores"></reference>
+ <reference name="Watchers"></reference>
+ <reference name="AttributeStore">
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="PersistentConfigurationList">
+ <type>AttributeStore</type>
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="ArtifactResolver">
+ <name>ArtifactResolver</name>
+ </reference>
+ </gbean>
+
+ <!-- Logging service -->
+ <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+ <attribute name="refreshPeriodSeconds">60</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+
</module>
Modified: geronimo/trunk/configs/javamail/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/javamail/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/javamail/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/javamail/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,37 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+ Copyright 2004-2005 The Apache Software Foundation
-Copyright 2004-2005 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.
+ 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$ $Date$ -->
-<!--
-Child of the geronimo/j2ee-server/${pom.version}/car module that includes deployment services
- parentId="geronimo/runtime-deployer/${pom.version}/car"
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="mail/MailSession" class="org.apache.geronimo.mail.MailGBean">
<attribute name="transportProtocol">smtp</attribute>
</gbean>
+
<gbean name="SMTPTransport" class="org.apache.geronimo.mail.SMTPTransportGBean">
<attribute name="host">localhost</attribute>
<attribute name="port">25</attribute>
</gbean>
+
</module>
Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
-->
<!-- $Rev$ $Date$ -->
+
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
@@ -53,13 +54,11 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>j2ee-server</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>jetty</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
</dependencies>
@@ -84,12 +83,13 @@
<attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
<attribute name="loadOnStartup">0</attribute>
<attribute name="initParams">
- acceptRanges=true
- dirAllowed=true
- putAllowed=false
- delAllowed=false
- redirectWelcome=false
- minGzipLength=8192</attribute>
+ acceptRanges=true
+ dirAllowed=true
+ putAllowed=false
+ delAllowed=false
+ redirectWelcome=false
+ minGzipLength=8192
+ </attribute>
<attribute name="servletMappings">/</attribute>
</gbean>
@@ -98,10 +98,11 @@
<attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
<attribute name="loadOnStartup">0</attribute>
<attribute name="initParams">
- development=false
- fork=false
- logVerbosityLevel=DEBUG
- xpoweredBy=false</attribute>
+ development=false
+ fork=false
+ logVerbosityLevel=DEBUG
+ xpoweredBy=false
+ </attribute>
<attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
</gbean>
Modified: geronimo/trunk/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,14 +17,7 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for Jetty server.
- parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- david jencks is not convinced that these 2 gbeans should be in this
plan and thinks they might belong in the console plan. Aaron thinks
Modified: geronimo/trunk/configs/jsp-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<context-root>/jsp-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -34,4 +31,5 @@
</role>
</role-mappings>
</security>
+
</web-app>
Modified: geronimo/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
<context-root>/jsp-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -34,4 +31,5 @@
</role>
</role-mappings>
</security>
+
</web-app>
Modified: geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,8 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security"
+<!--
+ Copyright 2004-2005 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$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
- >
<context-root>/ldap-demo</context-root>
<security-realm-name>ldap-realm</security-realm-name>
<security>
@@ -25,4 +41,5 @@
</role>
</role-mappings>
</security>
+
</web-app>
Modified: geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+<!--
+ Copyright 2004-2005 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$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
<context-root>/ldap-demo</context-root>
<security-realm-name>ldap-realm</security-realm-name>
@@ -24,4 +41,5 @@
</role>
</role-mappings>
</security>
+
</web-app>
Modified: geronimo/trunk/configs/ldap-realm/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-realm/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-realm/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/ldap-realm/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2004-2005 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$ $Date$ -->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
@@ -54,6 +71,5 @@
<name>JaasLoginService</name>
</reference>
</gbean>
-
</module>
Modified: geronimo/trunk/configs/online-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/online-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/online-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2005 The Apache Software Foundation
+ Copyright 2004-2005 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.
@@ -15,6 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<environment/>
Modified: geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,9 @@
-->
<!-- $Rev$ $Date$ -->
+
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
<gbean name="EJBBuilder" class="org.openejb.deployment.OpenEjbModuleBuilder">
<attribute name="listener">?name=WebContainer</attribute>
<attribute name="defaultStatelessEjbContainer">StatelessEjbContainer</attribute>
@@ -48,7 +49,6 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>openejb</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/trunk/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,139 +17,133 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the main ring of a Geronimo server.
-
-This module should contain those services normally provided
-by the server.
- parentId="${pom.groupId}/rmi-naming/${pom.version}/car"
-
--->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <gbean name="StatelessEjbContainer" class="org.openejb.slsb.DefaultStatelessEjbContainerGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- <reference name="TrackedConnectionAssociator">
- <name>ConnectionTracker</name>
- </reference>
- <reference name="TransactedTimer">
- <name>TransactionalThreadPooledTimer</name>
- </reference>
- <reference name="NontransactedTimer">
- <name>NonTransactionalThreadPooledTimer</name>
- </reference>
- <attribute name="securityEnabled">true</attribute>
- <attribute name="doAsCurrentCaller">true</attribute>
- <attribute name="useContextHandler">true</attribute>
- </gbean>
-
- <gbean name="StatefulEjbContainer" class="org.openejb.sfsb.DefaultStatefulEjbContainerGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- <reference name="TrackedConnectionAssociator">
- <name>ConnectionTracker</name>
- </reference>
- <attribute name="securityEnabled">true</attribute>
- <attribute name="doAsCurrentCaller">true</attribute>
- <attribute name="useContextHandler">true</attribute>
- </gbean>
-
- <gbean name="BmpEjbContainer" class="org.openejb.entity.bmp.DefaultBmpEjbContainerGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- <reference name="TrackedConnectionAssociator">
- <name>ConnectionTracker</name>
- </reference>
- <reference name="TransactedTimer">
- <name>TransactionalThreadPooledTimer</name>
- </reference>
- <reference name="NontransactedTimer">
- <name>NonTransactionalThreadPooledTimer</name>
- </reference>
- <attribute name="securityEnabled">true</attribute>
- <attribute name="doAsCurrentCaller">true</attribute>
- <attribute name="useContextHandler">true</attribute>
- </gbean>
-
- <gbean name="CmpEjbContainer" class="org.openejb.entity.cmp.DefaultCmpEjbContainerGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- <reference name="TrackedConnectionAssociator">
- <name>ConnectionTracker</name>
- </reference>
- <reference name="TransactedTimer">
- <name>TransactionalThreadPooledTimer</name>
- </reference>
- <reference name="NontransactedTimer">
- <name>NonTransactionalThreadPooledTimer</name>
- </reference>
- <attribute name="securityEnabled">true</attribute>
- <attribute name="doAsCurrentCaller">true</attribute>
- <attribute name="useContextHandler">true</attribute>
- </gbean>
-
- <gbean name="MdbEjbContainer" class="org.openejb.mdb.DefaultMdbContainerGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- <reference name="TrackedConnectionAssociator">
- <name>ConnectionTracker</name>
- </reference>
- <reference name="TransactedTimer">
- <name>TransactionalThreadPooledTimer</name>
- </reference>
- <reference name="NontransactedTimer">
- <name>NonTransactionalThreadPooledTimer</name>
- </reference>
- <attribute name="doAsCurrentCaller">true</attribute>
- </gbean>
-
- <gbean name="EJBNetworkService" class="org.activeio.xnet.StandardServiceStackGBean">
- <attribute name="name">EJB</attribute>
- <attribute name="port">${PlanOpenEJBPort}</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="allowHosts">${PlanClientAddresses}</attribute>
- <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
- <attribute name="logOnFailure">HOST,NAME</attribute>
- <reference name="Executor">
- <name>DefaultThreadPool</name>
- </reference>
- <reference name="Server">
- <name>EJBServer</name>
- </reference>
- </gbean>
-
- <gbean name="EJBServer" class="org.openejb.server.ejbd.EjbServerGBean">
- <reference name="DeploymentIndex">
- <name>DeploymentIndex</name>
- </reference>
- <reference name="ORBRefs">
- <name>Server</name>
- </reference>
- </gbean>
-
- <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
- <gbean name="DeploymentIndex" class="org.openejb.DeploymentIndexGBean">
- <references name="EjbDeployments">
- <pattern>
- <type>StatelessSessionBean</type>
- </pattern>
- <pattern>
- <type>StatefulSessionBean</type>
- </pattern>
- <pattern>
- <type>EntityBean</type>
- </pattern>
- </references>
- </gbean>
-
- <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJBGBean">
- <reference name="MBeanServerReference">
- <name>MBeanServerReference</name>
- </reference>
- </gbean>
+
+ <gbean name="StatelessEjbContainer" class="org.openejb.slsb.DefaultStatelessEjbContainerGBean">
+ <reference name="TransactionManager">
+ <name>TransactionManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="StatefulEjbContainer" class="org.openejb.sfsb.DefaultStatefulEjbContainerGBean">
+ <reference name="TransactionManager">
+ <name>TransactionManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <name>ConnectionTracker</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="BmpEjbContainer" class="org.openejb.entity.bmp.DefaultBmpEjbContainerGBean">
+ <reference name="TransactionManager">
+ <name>TransactionManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="CmpEjbContainer" class="org.openejb.entity.cmp.DefaultCmpEjbContainerGBean">
+ <reference name="TransactionManager">
+ <name>TransactionManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="MdbEjbContainer" class="org.openejb.mdb.DefaultMdbContainerGBean">
+ <reference name="TransactionManager">
+ <name>TransactionManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ </gbean>
+
+ <gbean name="EJBNetworkService" class="org.activeio.xnet.StandardServiceStackGBean">
+ <attribute name="name">EJB</attribute>
+ <attribute name="port">${PlanOpenEJBPort}</attribute>
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="allowHosts">${PlanClientAddresses}</attribute>
+ <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
+ <attribute name="logOnFailure">HOST,NAME</attribute>
+ <reference name="Executor">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="Server">
+ <name>EJBServer</name>
+ </reference>
+ </gbean>
+
+ <gbean name="EJBServer" class="org.openejb.server.ejbd.EjbServerGBean">
+ <reference name="DeploymentIndex">
+ <name>DeploymentIndex</name>
+ </reference>
+ <reference name="ORBRefs">
+ <name>Server</name>
+ </reference>
+ </gbean>
+
+ <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
+ <gbean name="DeploymentIndex" class="org.openejb.DeploymentIndexGBean">
+ <references name="EjbDeployments">
+ <pattern>
+ <type>StatelessSessionBean</type>
+ </pattern>
+ <pattern>
+ <type>StatefulSessionBean</type>
+ </pattern>
+ <pattern>
+ <type>EntityBean</type>
+ </pattern>
+ </references>
+ </gbean>
+
+ <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJBGBean">
+ <reference name="MBeanServerReference">
+ <name>MBeanServerReference</name>
+ </reference>
+ </gbean>
+
</module>
Modified: geronimo/trunk/configs/remote-deploy-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,11 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1">
<context-root>/remote-deploy</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -38,5 +33,6 @@
</sec:role>
</sec:role-mappings>
</sec:security>
- <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean" />
+ <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
+
</web-app>
Modified: geronimo/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,11 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
- xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1">
<context-root>/remote-deploy</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -38,5 +33,6 @@
</sec:role>
</sec:role-mappings>
</sec:security>
- <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean" />
+ <cfg:gbean name="LocatorToken" class="org.apache.geronimo.deployment.remote.RemoteDeployGBean"/>
+
</web-app>
Modified: geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/rmi-naming/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,16 +17,7 @@
<!-- $Rev$ $Date$ -->
-<!--
-Holds the RMI naming server module. This needs to be started
-after the system GBeans but before the server GBeans.
- parentId="${pom.groupId}/j2ee-system/${pom.version}/car"
-
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
<attribute name="port">${PlanNamingPort}</attribute>
@@ -42,7 +32,7 @@
<gbean name="SystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
<attribute name="systemProperties" />
<attribute name="systemPathProperties" />
-<!-- Can we get by without this?
+ <!-- Can we get by without this?
<attribute name="systemProperties">
javax.net.ssl.keyStorePassword=secret
javax.net.ssl.trustStorePassword=secret
@@ -51,7 +41,7 @@
javax.net.ssl.keyStore=var/security/keystores/geronimo-default
javax.net.ssl.trustStore=var/security/keystores/geronimo-default
</attribute>
--->
+ -->
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
@@ -74,27 +64,28 @@
<!-- Configuration Installer -->
<gbean name="PluginInstaller" class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- <reference name="ConfigStore">
- <name>Local</name>
- </reference>
- <reference name="ConfigManager">
- <name>ConfigurationManager</name>
- </reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <reference name="ThreadPool">
- <name>DefaultThreadPool</name>
- </reference>
- <reference name="PluginAttributeStore">
- <name>AttributeManager</name>
- </reference>
+ <reference name="Repository">
+ <name>Repository</name>
+ </reference>
+ <reference name="ConfigStore">
+ <name>Local</name>
+ </reference>
+ <reference name="ConfigManager">
+ <name>ConfigurationManager</name>
+ </reference>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <reference name="ThreadPool">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="PluginAttributeStore">
+ <name>AttributeManager</name>
+ </reference>
</gbean>
<gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
<attribute name="repositoryList">http://people.apache.org/~ammulder/plugin-repository-list.txt</attribute>
</gbean>
+
</module>
Modified: geronimo/trunk/configs/servlets-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<context-root>/servlets-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -34,4 +31,5 @@
</role>
</role-mappings>
</security>
+
</web-app>
Modified: geronimo/trunk/configs/servlets-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,7 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
<context-root>/servlets-examples</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -34,4 +31,5 @@
</role>
</role-mappings>
</security>
+
</web-app>
Modified: geronimo/trunk/configs/sharedlib/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/sharedlib/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/sharedlib/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/sharedlib/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,13 +15,9 @@
limitations under the License.
-->
-<!--
-Configuration for SharedLib.
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<!-- $Rev$ $Date$ -->
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<!-- The SharedLib Service -->
<gbean name="SharedLib" class="org.apache.geronimo.system.sharedlib.SharedLib">
Modified: geronimo/trunk/configs/shutdown/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/shutdown/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/shutdown/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/shutdown/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2005 The Apache Software Foundation
+ Copyright 2004-2005 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.
@@ -16,6 +15,8 @@
limitations under the License.
-->
+<!-- $Rev$ $Date$ -->
+
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <environment/>
+ <environment/>
</module>
Modified: geronimo/trunk/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/system-database/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/system-database/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,8 @@
<!-- $Rev$ $Date$ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
- >
<resourceadapter>
<outbound-resourceadapter>
<connection-definition>
@@ -50,11 +48,13 @@
<reference name="ServerInfo"><name>ServerInfo</name></reference>
<attribute name="derbySystemHome">var/derby</attribute>
</gbean>
+
<gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
<reference name="derbySystem"><name>DerbySystem</name></reference>
<attribute name="host">localhost</attribute>
<attribute name="port">1527</attribute>
</gbean>
+
<gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
<reference name="DerbySystem"><name>DerbySystem</name></reference>
</gbean>
Modified: geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,13 +41,11 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>j2ee-server</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tomcat</artifactId>
- <!--<version>${pom.version}</version>-->
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,13 +17,7 @@
<!-- $Rev$ $Date$ -->
-<!--
-Configuration for Tomcat server.
--->
-<module
- xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
<!-- copies tomcat initialization files into specified location -->
@@ -138,11 +131,11 @@
</dependency>
<!-- n.b. is you have more hosts, you want them to start before the engine gbean -->
<!-- ensure this by including dependencies like this -->
-<!--
+ <!--
<dependency>
<name>MyAdditionalHost</name>
</dependency>
--->
+ -->
</gbean>
<gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
Modified: geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -23,9 +23,7 @@
<web>uddi-jetty</web>
<external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.version}/war</external-path>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
-
<context-root>/juddi</context-root>
-
<gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
<!-- copies uddi derby db files into specified location -->
<attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
@@ -69,4 +67,5 @@
</ext-module>
<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
+
</application>
Modified: geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -68,4 +68,5 @@
</ext-module>
<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
+
</application>
Modified: geronimo/trunk/configs/unavailable-client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-client-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-client-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/unavailable-client-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2005 The Apache Software Foundation
+ Copyright 2004-2005 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.
@@ -16,9 +15,9 @@
limitations under the License.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<!-- $Rev$ $Date$ -->
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="UnavailableAppClientBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
Modified: geronimo/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/unavailable-ejb-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2005 The Apache Software Foundation
+ Copyright 2004-2005 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.
@@ -16,9 +15,9 @@
limitations under the License.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<!-- $Rev$ $Date$ -->
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="UnavailableEJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
Modified: geronimo/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/unavailable-webservices-deployer/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2005 The Apache Software Foundation
+ Copyright 2004-2005 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.
@@ -16,9 +15,9 @@
limitations under the License.
-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+<!-- $Rev$ $Date$ -->
- >
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<gbean name="UnavailableWebServiceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableWebServiceBuilder" />
Modified: geronimo/trunk/configs/upgrade-cli/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade-cli/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade-cli/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/upgrade-cli/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2004 The Apache Software Foundation
+ Copyright 2004-2005 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.
@@ -16,69 +15,59 @@
limitations under the License.
-->
+<!-- $Rev$ $Date$ -->
-<!--
-Configuration for the innermost ring of a Geronimo server.
-This module should only contain critical services needed to
-run other Configurations - for example, the ServerInfo, Logging
-and Repository services used to load them.
-
-This module should *NOT* be used to provide server or application
-specific services - those should be provided by children.
--->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <!-- ServerInfo service -->
- <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
- <!--Repository-->
- <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
- <attribute name="root">repository/</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
- <!--Configuration Store service-->
- <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- </gbean>
-
-
- <!-- ArtifactManager -->
- <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
-
- <!-- ArtifactResolver -->
- <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="Repositories">
- <!--<gbean-name>*:name=Repository,*</gbean-name>-->
- </reference>
- </gbean>
-
- <!--Configuration Manager service-->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
- <reference name="Repositories">
- </reference>
- <reference name="Stores">
- </reference>
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="ArtifactResolver">
- <name>ArtifactResolver</name>
- </reference>
- </gbean>
-
- <!-- Logging service -->
- <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configFileName">var/log/server-log4j.properties</attribute>
- <attribute name="refreshPeriodSeconds">60</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
+ <!-- ServerInfo service -->
+ <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
+
+ <!--Repository-->
+ <gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
+ <attribute name="root">repository/</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+
+ <!--Configuration Store service-->
+ <gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
+ <reference name="Repository">
+ <name>Repository</name>
+ </reference>
+ </gbean>
+
+ <!-- ArtifactManager -->
+ <gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
+
+ <!-- ArtifactResolver -->
+ <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="Repositories">
+ <!--<gbean-name>*:name=Repository,*</gbean-name>--></reference>
+ </gbean>
+
+ <!--Configuration Manager service-->
+ <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+ <reference name="Repositories"></reference>
+ <reference name="Stores"></reference>
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="ArtifactResolver">
+ <name>ArtifactResolver</name>
+ </reference>
+ </gbean>
+
+ <!-- Logging service -->
+ <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+ <attribute name="refreshPeriodSeconds">60</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+
</module>
Modified: geronimo/trunk/configs/upgrade/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/upgrade/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Copyright 2006 The Apache Software Foundation
+ Copyright 2004-2005 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.
@@ -16,7 +15,10 @@
limitations under the License.
-->
+<!-- $Rev$ $Date$ -->
+
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
<!-- Deployer used to process modules and plans -->
<gbean name="Upgrade" class="org.apache.geronimo.upgrade.UpgradeGBean">
</gbean>
Modified: geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,8 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<context-root>/</context-root>
+
</web-app>
Modified: geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml?rev=432923&r1=432922&r2=432923&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml Sat Aug 19 18:30:07 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +17,8 @@
<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
-
- >
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
<context-root>/</context-root>
+
</web-app>