You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/09/20 00:23:50 UTC
svn commit: r447998 [1/2] - in /geronimo/server/trunk:
assemblies/geronimo-jetty-j2ee/src/main/var/config/
assemblies/geronimo-jetty-minimal/
assemblies/geronimo-jetty-minimal/src/main/var/config/
assemblies/geronimo-tomcat-j2ee/src/main/var/config/ as...
Author: djencks
Date: Tue Sep 19 15:23:47 2006
New Revision: 447998
URL: http://svn.apache.org/viewvc?view=rev&rev=447998
Log:
GERONIMO-2398 Create transaction and connector-deployer configs, clean up a lot of dependency problems, and fix major app client module builder classloader bugs
Added:
geronimo/server/trunk/configs/client-transaction/
- copied from r441986, geronimo/server/trunk/configs/client/
geronimo/server/trunk/configs/client-transaction/LICENSE.txt
- copied unchanged from r447996, geronimo/server/trunk/configs/client/LICENSE.txt
geronimo/server/trunk/configs/client-transaction/NOTICE.txt
- copied unchanged from r447996, geronimo/server/trunk/configs/client/NOTICE.txt
geronimo/server/trunk/configs/client-transaction/pom.xml
- copied, changed from r447996, geronimo/server/trunk/configs/client/pom.xml
geronimo/server/trunk/configs/client-transaction/src/
- copied from r447996, geronimo/server/trunk/configs/client/src/
geronimo/server/trunk/configs/connector-deployer/
- copied from r441986, geronimo/server/trunk/configs/j2ee-deployer/
geronimo/server/trunk/configs/connector-deployer/LICENSE.txt
- copied unchanged from r447996, geronimo/server/trunk/configs/j2ee-deployer/LICENSE.txt
geronimo/server/trunk/configs/connector-deployer/NOTICE.txt
- copied unchanged from r447996, geronimo/server/trunk/configs/j2ee-deployer/NOTICE.txt
geronimo/server/trunk/configs/connector-deployer/pom.xml
- copied, changed from r447996, geronimo/server/trunk/configs/j2ee-deployer/pom.xml
geronimo/server/trunk/configs/connector-deployer/src/
- copied from r447996, geronimo/server/trunk/configs/j2ee-deployer/src/
geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (with props)
geronimo/server/trunk/configs/transaction/
- copied from r441840, geronimo/server/trunk/configs/j2ee-server/
geronimo/server/trunk/configs/transaction/LICENSE.txt
- copied unchanged from r447996, geronimo/server/trunk/configs/j2ee-server/LICENSE.txt
geronimo/server/trunk/configs/transaction/NOTICE.txt
- copied unchanged from r447996, geronimo/server/trunk/configs/j2ee-server/NOTICE.txt
geronimo/server/trunk/configs/transaction/pom.xml
- copied, changed from r447996, geronimo/server/trunk/configs/j2ee-server/pom.xml
geronimo/server/trunk/configs/transaction/src/
- copied from r447996, geronimo/server/trunk/configs/j2ee-server/src/
Removed:
geronimo/server/trunk/modules/geronimo-client-builder/src/main/resources/
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
geronimo/server/trunk/configs/activemq/pom.xml
geronimo/server/trunk/configs/client-deployer/pom.xml
geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
geronimo/server/trunk/configs/client/pom.xml
geronimo/server/trunk/configs/client/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-corba/pom.xml
geronimo/server/trunk/configs/j2ee-deployer/pom.xml
geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-security/pom.xml
geronimo/server/trunk/configs/j2ee-server/pom.xml
geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml
geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/jetty/pom.xml
geronimo/server/trunk/configs/openejb-deployer/pom.xml
geronimo/server/trunk/configs/openejb/pom.xml
geronimo/server/trunk/configs/pom.xml
geronimo/server/trunk/configs/rmi-naming/pom.xml
geronimo/server/trunk/configs/system-database/pom.xml
geronimo/server/trunk/configs/tomcat/pom.xml
geronimo/server/trunk/configs/transaction/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-jetty/pom.xml
geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/trunk/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Tue Sep 19 15:23:47 2006
@@ -22,9 +22,10 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
- </module>
-
+ <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+
+ <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
<gbean name="JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -104,6 +105,8 @@
</gbean>
</module>
+ <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
<gbean name="EJBBuilder">
<attribute name="listener">?name=JettyWebContainer</attribute>
@@ -111,7 +114,7 @@
</module>
<module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
-
+
<module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
<module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml Tue Sep 19 15:23:47 2006
@@ -88,6 +88,13 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml Tue Sep 19 15:23:47 2006
@@ -23,7 +23,9 @@
</module>
<module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
-
+
+ <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
<gbean name="JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -60,6 +62,8 @@
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
</gbean>
</module>
+
+ <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
<module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Tue Sep 19 15:23:47 2006
@@ -22,9 +22,10 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
- </module>
-
+ <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+
+ <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
<gbean name="JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -113,6 +114,8 @@
</gbean>
</module>
+ <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
<gbean name="EJBBuilder">
<attribute name="listener">?name=TomcatWebContainer</attribute>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml Tue Sep 19 15:23:47 2006
@@ -88,11 +88,18 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>connector-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>remote-deploy-tomcat</artifactId>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml Tue Sep 19 15:23:47 2006
@@ -23,7 +23,9 @@
</module>
<module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
-
+
+ <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+
<module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
<gbean name="JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -62,6 +64,8 @@
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
</gbean>
</module>
+
+ <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
<module name="org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car"/>
Modified: geronimo/server/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/activemq/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq/pom.xml Tue Sep 19 15:23:47 2006
@@ -41,7 +41,15 @@
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>ge-activemq-rar</artifactId>
@@ -60,9 +68,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${clientDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${axisDeployer}</deploymentConfig>
+ <deploymentConfig>${connectorDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/pom.xml Tue Sep 19 15:23:47 2006
@@ -41,67 +41,81 @@
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
+ <scope>compile</scope>
</dependency>
-
- <!-- this will get g-j2ee-schema -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client-transaction</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
+ <scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-management</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-transaction</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!-- this will get g-j2ee-schema -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-j2ee-builder</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
+ <artifactId>geronimo-client-builder</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-naming-builder</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-naming</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-security-builder</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-security</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-axis</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-webservices</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -109,17 +123,17 @@
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-connector</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-web-builder</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -21,6 +21,9 @@
<attribute name="transactionManagerObjectName">?name=TransactionManager</attribute>
<attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
<attribute name="corbaGBeanObjectName">?name=Server</attribute>
+ <reference name="Repositories">
+ <!--<gbean-name>*:name=Repository,*</gbean-name>-->
+ </reference>
<reference name="SecurityBuilder">
<name>SecurityBuilder</name>
</reference>
@@ -93,6 +96,13 @@
</reference>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>client-transaction</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
</environment>
</xml-attribute>
</gbean>
Copied: geronimo/server/trunk/configs/client-transaction/pom.xml (from r447996, geronimo/server/trunk/configs/client/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/pom.xml?view=diff&rev=447998&p1=geronimo/server/trunk/configs/client/pom.xml&r1=447996&p2=geronimo/server/trunk/configs/client-transaction/pom.xml&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/pom.xml Tue Sep 19 15:23:47 2006
@@ -28,8 +28,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>client</artifactId>
- <name>Geronimo Configs :: J2EE Client</name>
+ <artifactId>client-transaction</artifactId>
+ <name>Geronimo Configs :: J2EE Client transaction</name>
<packaging>car</packaging>
<dependencies>
@@ -37,17 +37,11 @@
<!-- parent config -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>client-system</artifactId>
+ <artifactId>client</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<!-- connector deploys jsr77 beans hence needs j2ee, mgmt -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -55,178 +49,11 @@
<version>${pom.version}</version>
</dependency>
- <!-- ThreadPool -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- ?????? -->
- <!--
- for property editor support for some login modules/principals
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </dependency> -->
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- should be transitive dependency of geronimo-j2ee -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jsp_2.0_spec</artifactId>-->
- <!--</dependency>-->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </dependency>
-
- <!--dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.1_spec</artifactId>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-servlet_2.4_spec</artifactId>-->
- <!--</dependency>-->
-
- <!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
- <!-- openejb-core, tranql, asm, activemq, activeio, scout, juddi,
- concurrent, jdom -->
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <!--
- NOTE: Used by dependencies... :-(
- -->
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
-
- <!-- REMOVE WHEN G-2383 is applied -->
- <dependency>
- <groupId>org.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
-
- <!--
- NOTE: OpenEJB2 still references geronimo-spec:geronimo-spec-corba in
- a geronimo-dependency.xml, and until that is changed we need
- to keep using this old m1-based artifact
- -->
- <dependency>
- <!--
- <groupId>org.apache.geronimo.specs</groupId>
- -->
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-corba</artifactId>
- </dependency>
-
</dependencies>
Modified: geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml?view=diff&rev=447998&r1=447996&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -19,20 +19,7 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <!-- Naming properties -->
- <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
- <attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
- <attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
- <attribute name="namingProviderUrl">rmi://localhost:${PlanNamingPort}</attribute>
- </gbean>
-
<!--client connector support-->
- <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
- <attribute name="keepAliveTime">5000</attribute>
- <attribute name="poolSize">100</attribute>
- <attribute name="poolName">DefaultThreadPool</attribute>
- </gbean>
-
<gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
<reference name="TransactionManager">
<name>TransactionManager</name>
@@ -74,54 +61,4 @@
</references>
</gbean>
- <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
-
- <gbean name="geronimo.client" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <reference name="JVMs"/>
- <references name="Resources">
- <pattern>
- <type>JCAResource</type>
- </pattern>
- <pattern>
- <type>JavaMailResource</type>
- </pattern>
- <pattern>
- <type>JDBCResource</type>
- </pattern>
- <pattern>
- <type>JMSResource</type>
- </pattern>
- <pattern>
- <type>JNDIResource</type>
- </pattern>
- <pattern>
- <type>JTAResource</type>
- </pattern>
- <pattern>
- <type>RMI_IIOPResource</type>
- </pattern>
- <pattern>
- <type>URLResource</type>
- </pattern>
- </references>
- <reference name="Applications"/>
- <reference name="AppClientModules"/>
- <reference name="WebModules"/>
- <reference name="EJBModules"/>
- <reference name="ResourceAdapterModules"/>
- <reference name="WebManagers"/>
- <reference name="EJBManagers"/>
- <reference name="JMSManagers"/>
- <reference name="ThreadPools"/>
- <reference name="Repositories"/>
- <reference name="SecurityRealms"/>
- <reference name="LoginServices"/>
- <reference name="KeystoreManagers"/>
- <reference name="ConfigurationManager">
- <name>ConfigurationManager</name>
- </reference>
- </gbean>
</module>
Modified: geronimo/server/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Tue Sep 19 15:23:47 2006
@@ -42,27 +42,19 @@
<type>car</type>
</dependency>
+ <!-- ThreadPool -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- connector deploys jsr77 beans hence needs j2ee, mgmt -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
+ <artifactId>geronimo-core</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <!-- ThreadPool -->
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
+ <artifactId>geronimo-activation</artifactId>
<version>${pom.version}</version>
</dependency>
- <!-- ?????? -->
<!--
for property editor support for some login modules/principals
@@ -88,12 +80,6 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: geronimo/server/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/src/plan/plan.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -26,52 +26,10 @@
<attribute name="namingProviderUrl">rmi://localhost:${PlanNamingPort}</attribute>
</gbean>
- <!--client connector support-->
<gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime">5000</attribute>
<attribute name="poolSize">100</attribute>
<attribute name="poolName">DefaultThreadPool</attribute>
- </gbean>
-
- <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- </gbean>
-
- <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
- <reference name="SyncPool">
- <name>DefaultThreadPool</name>
- </reference>
- <reference name="StartPool">
- <name>DefaultThreadPool</name>
- </reference>
- <reference name="ScheduledPool">
- <name>DefaultThreadPool</name>
- </reference>
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- </gbean>
-
- <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
- <attribute name="tmId">71,84,77,73,68</attribute>
- </gbean>
-
- <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
- <!--no transaction log on the client-->
- <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
- <reference name="XidFactory">
- <name>XidFactory</name>
- </reference>
- <references name="ResourceManagers">
- <pattern>
- <type>JCAManagedConnectionFactory</type>
- </pattern>
- <pattern>
- <type>ActivationSpec</type>
- </pattern>
- </references>
</gbean>
<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
Copied: geronimo/server/trunk/configs/connector-deployer/pom.xml (from r447996, geronimo/server/trunk/configs/j2ee-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/pom.xml?view=diff&rev=447998&p1=geronimo/server/trunk/configs/j2ee-deployer/pom.xml&r1=447996&p2=geronimo/server/trunk/configs/connector-deployer/pom.xml&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/pom.xml Tue Sep 19 15:23:47 2006
@@ -28,94 +28,33 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>j2ee-deployer</artifactId>
- <name>Geronimo Configs :: J2EE Deployer</name>
+ <artifactId>connector-deployer</artifactId>
+ <name>Geronimo Configs :: Connector Deployer</name>
<packaging>car</packaging>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
- <!-- import the classes -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
- <version>${geronimoVersion}</version>
+ <artifactId>transaction</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- need transaction, core, j2ee-schema, management -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- this should get connector -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- why is this spec not in the classpath ?? -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
</dependencies>
</project>
Added: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=auto&rev=447998
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 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">
+
+ <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <attribute name="defaultMaxSize">10</attribute>
+ <attribute name="defaultMinSize">0</attribute>
+ <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+ <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+ <attribute name="defaultXATransactionCaching">true</attribute>
+ <attribute name="defaultXAThreadCaching">false</attribute>
+ <reference name="ServiceBuilders">
+ <name>GBeanBuilder</name>
+ </reference>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>transaction</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ </gbean>
+
+ <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder"/>
+ <gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder"/>
+
+</module>
Propchange: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba/pom.xml Tue Sep 19 15:23:47 2006
@@ -43,13 +43,6 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-security</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
<version>${pom.version}</version>
<type>car</type>
@@ -65,9 +58,7 @@
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Tue Sep 19 15:23:47 2006
@@ -41,7 +41,6 @@
<type>car</type>
</dependency>
- <!-- import the classes -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
@@ -49,7 +48,15 @@
<type>car</type>
<scope>compile</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
@@ -62,17 +69,11 @@
<version>${pom.version}</version>
</dependency>
- <!-- need transaction, core, j2ee-schema, management -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming-builder</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -85,34 +86,16 @@
<artifactId>geronimo-web-builder</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <!-- this should get connector -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
+ <artifactId>geronimo-test-ddbean</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- why is this spec not in the classpath ?? -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -83,29 +83,6 @@
</references>
</gbean>
- <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
- <attribute name="defaultMaxSize">10</attribute>
- <attribute name="defaultMinSize">0</attribute>
- <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
- <attribute name="defaultIdleTimeoutMinutes">15</attribute>
- <attribute name="defaultXATransactionCaching">true</attribute>
- <attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="ServiceBuilders">
- <name>GBeanBuilder</name>
- </reference>
- <xml-attribute name="defaultEnvironment">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>j2ee-server</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- </gbean>
-
<gbean name="SecurityBuilder" class="org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl"/>
<gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
@@ -152,8 +129,6 @@
<gbean name="GBeanRefBuilder" class="org.apache.geronimo.naming.deployment.GBeanRefBuilder"/>
<gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.naming.deployment.PersistenceContextRefBuilder"/>
- <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder"/>
- <gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder"/>
<gbean name="EnvironmentEntryBuilder" class="org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder"/>
</module>
Modified: geronimo/server/trunk/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-security/pom.xml Tue Sep 19 15:23:47 2006
@@ -43,45 +43,18 @@
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
<version>${pom.version}</version>
</dependency>
- <!-- These 2 need to be in plan.xml ????? -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jmx-remoting</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
</dependencies>
<build>
@@ -92,7 +65,6 @@
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Modified: geronimo/server/trunk/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/pom.xml Tue Sep 19 15:23:47 2006
@@ -57,7 +57,19 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -19,76 +19,6 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- </gbean>
-
- <gbean name="ConnectorThreadPool" class="org.apache.geronimo.pool.ThreadPool">
- <attribute name="keepAliveTime">5000</attribute>
- <attribute name="poolSize">30</attribute>
- <attribute name="poolName">ConnectorThreadPool</attribute>
- </gbean>
-
- <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
- <reference name="SyncPool">
- <name>ConnectorThreadPool</name>
- </reference>
- <reference name="StartPool">
- <name>ConnectorThreadPool</name>
- </reference>
- <reference name="ScheduledPool">
- <name>ConnectorThreadPool</name>
- </reference>
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- </gbean>
-
- <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLogGBean">
- <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
- <attribute name="bufferSizeKBytes">32</attribute>
- <attribute name="checksumEnabled">true</attribute>
- <attribute name="flushSleepTimeMilliseconds">50</attribute>
- <attribute name="logFileDir">var/txlog</attribute>
- <attribute name="logFileExt">log</attribute>
- <attribute name="logFileName">howl</attribute>
- <attribute name="maxBlocksPerFile">-1</attribute>
- <attribute name="maxBuffers">0</attribute>
- <attribute name="maxLogFiles">2</attribute>
- <attribute name="minBuffers">4</attribute>
- <attribute name="threadsWaitingForceThreshold">-1</attribute>
- <reference name="XidFactory">
- <name>XidFactory</name>
- </reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
- <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
- <attribute name="tmId">71,84,77,73,68</attribute>
- </gbean>
-
- <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
- <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
- <reference name="XidFactory">
- <name>XidFactory</name>
- </reference>
- <reference name="TransactionLog">
- <name>HOWLTransactionLog</name>
- </reference>
- <references name="ResourceManagers">
- <pattern>
- <type>JCAManagedConnectionFactory</type>
- </pattern>
- <pattern>
- <type>ActivationSpec</type>
- </pattern>
- </references>
- </gbean>
-
<!-- JSR77 Management Objects -->
<gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
<reference name="Servers"/>
Modified: geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -57,12 +57,15 @@
<gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
<!-- ArtifactResolver -->
- <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
+ <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
<reference name="ArtifactManager">
<name>ArtifactManager</name>
</reference>
- <reference name="Repositories">
- <!--<gbean-name>*:name=Repository,*</gbean-name>--></reference>
+ <reference name="Repositories"></reference>
+ <attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
</gbean>
<!--Configuration Manager service-->
Modified: geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -57,11 +57,11 @@
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>j2ee-server</artifactId>
- <type>car</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>${pom.groupId}</groupId>-->
+ <!--<artifactId>j2ee-server</artifactId>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>jetty</artifactId>
Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Tue Sep 19 15:23:47 2006
@@ -36,30 +36,38 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
</dependency>
<!-- This dependency should be retrieved by transitivity -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-clustering</artifactId>
+ <artifactId>geronimo-jetty</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
+ <artifactId>geronimo-clustering</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
</dependencies>
</project>
Modified: geronimo/server/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/pom.xml Tue Sep 19 15:23:47 2006
@@ -40,26 +40,20 @@
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
+ <scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <!-- this should get openejb -->
+
<dependency>
<groupId>org.openejb</groupId>
<artifactId>openejb-builder</artifactId>
@@ -70,23 +64,18 @@
<artifactId>openejb-pkgen-builder</artifactId>
</dependency>
- <dependency>
- <groupId>org.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
-
<!--
NOTE: OpenEJB2 still references geronimo-spec:geronimo-spec-corba in
a geronimo-dependency.xml, and until that is changed we need
to keep using this old m1-based artifact
-->
- <dependency>
+ <!--<dependency>-->
<!--
<groupId>org.apache.geronimo.specs</groupId>
-->
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-corba</artifactId>
- </dependency>
+ <!--<groupId>geronimo-spec</groupId>-->
+ <!--<artifactId>geronimo-spec-corba</artifactId>-->
+ <!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Tue Sep 19 15:23:47 2006
@@ -43,6 +43,20 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis</artifactId>
<version>${pom.version}</version>
<type>car</type>
Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Sep 19 15:23:47 2006
@@ -43,6 +43,7 @@
<gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car</j2eeDeployer>
<clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${pom.version}/car</connectorDeployer>
<openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
<tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
@@ -120,6 +121,8 @@
<module>client-deployer</module>
<module>client-security</module>
<module>client-system</module>
+ <module>client-transaction</module>
+ <module>connector-deployer</module>
<module>webconsole-jetty</module>
<module>webconsole-tomcat</module>
<!-- <module>daytrader-jetty</module> -->
@@ -155,6 +158,7 @@
<module>system-database</module>
<module>tomcat</module>
<module>tomcat-deployer</module>
+ <module>transaction</module>
<module>uddi-jetty</module>
<module>uddi-tomcat</module>
<module>unavailable-client-deployer</module>
Modified: geronimo/server/trunk/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/rmi-naming/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/configs/rmi-naming/pom.xml Tue Sep 19 15:23:47 2006
@@ -112,24 +112,13 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
</dependency>
-
+
+ <!-- thread pool has management interface -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -145,37 +134,8 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
<version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
</dependency>
<!-- remote login -->
Modified: geronimo/server/trunk/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/system-database/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/system-database/pom.xml (original)
+++ geronimo/server/trunk/configs/system-database/pom.xml Tue Sep 19 15:23:47 2006
@@ -41,33 +41,15 @@
<type>car</type>
</dependency>
- <!-- make sure all the deployers are available -->
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>axis-deployer</artifactId>
+ <artifactId>connector-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>client-deployer</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-derby</artifactId>
<version>${pom.version}</version>
@@ -106,9 +88,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${clientDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${axisDeployer}</deploymentConfig>
+ <deploymentConfig>${connectorDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>tranql</groupId>
Modified: geronimo/server/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat/pom.xml Tue Sep 19 15:23:47 2006
@@ -36,24 +36,30 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>rmi-naming</artifactId>
+ <artifactId>j2ee-server</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>transaction</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
</dependency>
-
- <!-- this should have come via g-tomcat
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
+ <artifactId>geronimo-tomcat</artifactId>
<version>${pom.version}</version>
</dependency>
- -->
</dependencies>
Copied: geronimo/server/trunk/configs/transaction/pom.xml (from r447996, geronimo/server/trunk/configs/j2ee-server/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/pom.xml?view=diff&rev=447998&p1=geronimo/server/trunk/configs/j2ee-server/pom.xml&r1=447996&p2=geronimo/server/trunk/configs/transaction/pom.xml&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/configs/transaction/pom.xml Tue Sep 19 15:23:47 2006
@@ -28,15 +28,15 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>j2ee-server</artifactId>
- <name>Geronimo Configs :: J2EE Server</name>
+ <artifactId>transaction</artifactId>
+ <name>Geronimo Configs :: Transaction Manager</name>
<packaging>car</packaging>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>rmi-naming</artifactId>
+ <artifactId>j2ee-server</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
@@ -48,13 +48,6 @@
<version>${pom.version}</version>
</dependency>
- <!-- ?????? -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
@@ -63,14 +56,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
+ <artifactId>geronimo-transaction</artifactId>
<version>${pom.version}</version>
</dependency>
- <!-- purpose unknown -->
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>org.objectweb.howl</groupId>
+ <artifactId>howl</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/src/plan/plan.xml?view=diff&rev=447998&r1=447996&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transaction/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -89,70 +89,4 @@
</references>
</gbean>
- <!-- JSR77 Management Objects -->
- <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
- <reference name="Servers"/>
- </gbean>
- <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <reference name="JVMs"/>
- <references name="Resources">
- <pattern>
- <type>JCAResource</type>
- </pattern>
- <pattern>
- <type>JavaMailResource</type>
- </pattern>
- <pattern>
- <type>JDBCResource</type>
- </pattern>
- <pattern>
- <type>JMSResource</type>
- </pattern>
- <pattern>
- <type>JNDIResource</type>
- </pattern>
- <pattern>
- <type>JTAResource</type>
- </pattern>
- <pattern>
- <type>RMI_IIOPResource</type>
- </pattern>
- <pattern>
- <type>URLResource</type>
- </pattern>
- </references>
- <reference name="Applications"/>
- <reference name="AppClientModules"/>
- <reference name="WebModules"/>
- <reference name="EJBModules"/>
- <reference name="ResourceAdapterModules"/>
- <reference name="WebManagers"/>
- <reference name="EJBManagers"/>
- <reference name="JMSManagers"/>
- <reference name="ThreadPools"/>
- <reference name="Repositories"/>
- <reference name="WritableRepos"/>
- <reference name="SecurityRealms"/>
- <reference name="LoginServices"/>
- <reference name="KeystoreManagers"/>
- <reference name="PluginRepoLists"/>
- <reference name="PluginInstaller">
- <name>PluginInstaller</name>
- </reference>
- <reference name="ConfigurationManager">
- <name>ConfigurationManager</name>
- </reference>
- </gbean>
-
- <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl">
- <reference name="SystemLog">
- <name>Logger</name>
- </reference>
- </gbean>
-
- <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
-
</module>
Modified: geronimo/server/trunk/configs/webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/pom.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/pom.xml Tue Sep 19 15:23:47 2006
@@ -71,14 +71,6 @@
<type>car</type>
</dependency>
- <!-- for login module manager -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-security</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-core</artifactId>
@@ -105,36 +97,18 @@
<version>${pom.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-deploy-config</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
<version>${pom.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-test-ddbean</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-upgrade</artifactId>
<version>${pom.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-util</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-gbean</artifactId>
@@ -181,9 +155,6 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${jettyDeployer}</deploymentConfig>
- <deploymentConfig>${clientDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.applications.console</groupId>
Modified: geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml?view=diff&rev=447998&r1=447997&r2=447998
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml Tue Sep 19 15:23:47 2006
@@ -32,6 +32,14 @@
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<context-root>/console-standard</context-root>
<security-realm-name>geronimo-properties-realm</security-realm-name>
+ <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <reference name="LoginModule">
+ <name>properties-login</name>
+ </reference>
+ </gbean>
</web-app>
</module>
@@ -49,20 +57,19 @@
</security>
<!-- Console specific server info -->
- <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <reference name="LoginModule">
- <name>properties-login</name>
- </reference>
- </gbean>
+ <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
+ <!--<reference name="ServerInfo">-->
+ <!--<name>ServerInfo</name>-->
+ <!--</reference>-->
+ <!--<reference name="LoginModule">-->
+ <!--<name>properties-login</name>-->
+ <!--</reference>-->
+ <!--</gbean>-->
<!-- Keystore configuration -->
<gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
<attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
- <attribute name="keyStoreType">jks</attribute>
- <attribute name="keyStoreProvider">SUN</attribute>
+ <attribute name="keyStoreType">PKCS12</attribute>
<attribute name="keyStorePassword">password</attribute>
<reference name="serverInfo">
<name>ServerInfo</name>