You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/09/25 16:58:44 UTC
svn commit: r449697 [1/4] - in /geronimo/server/branches/sachin: ./
applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/
applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/conf...
Author: sppatel
Date: Mon Sep 25 07:58:35 2006
New Revision: 449697
URL: http://svn.apache.org/viewvc?view=rev&rev=449697
Log:
update from head
Added:
geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties
- copied unchanged from r449690, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties
geronimo/server/branches/sachin/configs/client-transaction/ (props changed)
- copied from r449690, geronimo/server/trunk/configs/client-transaction/
geronimo/server/branches/sachin/configs/client-transaction/LICENSE.txt
- copied unchanged from r449690, geronimo/server/trunk/configs/client-transaction/LICENSE.txt
geronimo/server/branches/sachin/configs/client-transaction/NOTICE.txt
- copied unchanged from r449690, geronimo/server/trunk/configs/client-transaction/NOTICE.txt
geronimo/server/branches/sachin/configs/client-transaction/pom.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/client-transaction/pom.xml
geronimo/server/branches/sachin/configs/client-transaction/src/
- copied from r449690, geronimo/server/trunk/configs/client-transaction/src/
geronimo/server/branches/sachin/configs/client-transaction/src/plan/
- copied from r449690, geronimo/server/trunk/configs/client-transaction/src/plan/
geronimo/server/branches/sachin/configs/client-transaction/src/plan/plan.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
geronimo/server/branches/sachin/configs/client-transaction/src/site/
- copied from r449690, geronimo/server/trunk/configs/client-transaction/src/site/
geronimo/server/branches/sachin/configs/client-transaction/src/site/apt/
- copied from r449690, geronimo/server/trunk/configs/client-transaction/src/site/apt/
geronimo/server/branches/sachin/configs/client-transaction/src/site/site.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/client-transaction/src/site/site.xml
geronimo/server/branches/sachin/configs/connector-deployer/ (props changed)
- copied from r449690, geronimo/server/trunk/configs/connector-deployer/
geronimo/server/branches/sachin/configs/connector-deployer/LICENSE.txt
- copied unchanged from r449690, geronimo/server/trunk/configs/connector-deployer/LICENSE.txt
geronimo/server/branches/sachin/configs/connector-deployer/NOTICE.txt
- copied unchanged from r449690, geronimo/server/trunk/configs/connector-deployer/NOTICE.txt
geronimo/server/branches/sachin/configs/connector-deployer/pom.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/connector-deployer/pom.xml
geronimo/server/branches/sachin/configs/connector-deployer/src/
- copied from r449690, geronimo/server/trunk/configs/connector-deployer/src/
geronimo/server/branches/sachin/configs/connector-deployer/src/plan/
- copied from r449690, geronimo/server/trunk/configs/connector-deployer/src/plan/
geronimo/server/branches/sachin/configs/connector-deployer/src/plan/plan.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/connector-deployer/src/site/
- copied from r449690, geronimo/server/trunk/configs/connector-deployer/src/site/
geronimo/server/branches/sachin/configs/connector-deployer/src/site/apt/
- copied from r449690, geronimo/server/trunk/configs/connector-deployer/src/site/apt/
geronimo/server/branches/sachin/configs/connector-deployer/src/site/site.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/connector-deployer/src/site/site.xml
geronimo/server/branches/sachin/configs/transaction/ (props changed)
- copied from r449690, geronimo/server/trunk/configs/transaction/
geronimo/server/branches/sachin/configs/transaction/LICENSE.txt
- copied unchanged from r449690, geronimo/server/trunk/configs/transaction/LICENSE.txt
geronimo/server/branches/sachin/configs/transaction/NOTICE.txt
- copied unchanged from r449690, geronimo/server/trunk/configs/transaction/NOTICE.txt
geronimo/server/branches/sachin/configs/transaction/pom.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/transaction/pom.xml
geronimo/server/branches/sachin/configs/transaction/src/
- copied from r449690, geronimo/server/trunk/configs/transaction/src/
geronimo/server/branches/sachin/configs/transaction/src/plan/
- copied from r449690, geronimo/server/trunk/configs/transaction/src/plan/
geronimo/server/branches/sachin/configs/transaction/src/plan/plan.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/transaction/src/plan/plan.xml
geronimo/server/branches/sachin/configs/transaction/src/site/
- copied from r449690, geronimo/server/trunk/configs/transaction/src/site/
geronimo/server/branches/sachin/configs/transaction/src/site/apt/
- copied from r449690, geronimo/server/trunk/configs/transaction/src/site/apt/
geronimo/server/branches/sachin/configs/transaction/src/site/site.xml
- copied unchanged from r449690, geronimo/server/trunk/configs/transaction/src/site/site.xml
geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/DatabaseInitializationGBean.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/
- copied from r449690, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-13.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-13.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-14.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-14.xml
geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/MockResourceEnvironmentSetter.java
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/MockResourceEnvironmentSetter.java
geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentSetter.java
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ResourceEnvironmentSetter.java
geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/MockResourceEnvironmentSetter.java
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/MockResourceEnvironmentSetter.java
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/java/org/apache/geronimo/web/deployment/SchemaConversionTest.java
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/java/org/apache/geronimo/web/deployment/SchemaConversionTest.java
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_2dtd/
- copied from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_2dtd/
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_2dtd/web-1-22.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_2dtd/web-1-22.xml
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_2dtd/web-1-24.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_2dtd/web-1-24.xml
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/
- copied from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-1-23.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-1-23.xml
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-1-24.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-1-24.xml
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-23.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-23.xml
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-24.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_3dtd/web-24.xml
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_4schema/
- copied from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_4schema/
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_4schema/web-1-24.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_4schema/web-1-24.xml
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/test/resources/j2ee_1_4schema/web-2-24.xml
- copied unchanged from r449690, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/j2ee_1_4schema/web-2-24.xml
Removed:
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/resources/
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_2dtd/web-1-22.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_2dtd/web-1-24.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_3dtd/application-13.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_3dtd/application-14.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_3dtd/web-1-23.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_3dtd/web-1-24.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_3dtd/web-23.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_3dtd/web-24.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_4schema/web-1-24.xml
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/resources/j2ee_1_4schema/web-2-24.xml
Modified:
geronimo/server/branches/sachin/all_changes.log
geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml
geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml
geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
geronimo/server/branches/sachin/bootstrap.xml
geronimo/server/branches/sachin/configs/activemq/pom.xml
geronimo/server/branches/sachin/configs/client-deployer/pom.xml
geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/client/pom.xml
geronimo/server/branches/sachin/configs/client/src/plan/plan.xml
geronimo/server/branches/sachin/configs/j2ee-corba/pom.xml
geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml
geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/j2ee-security/pom.xml
geronimo/server/branches/sachin/configs/j2ee-server/pom.xml
geronimo/server/branches/sachin/configs/j2ee-server/src/plan/plan.xml
geronimo/server/branches/sachin/configs/j2ee-system/src/plan/plan.xml
geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml
geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/jetty/pom.xml
geronimo/server/branches/sachin/configs/openejb-deployer/pom.xml
geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/openejb/pom.xml
geronimo/server/branches/sachin/configs/pom.xml
geronimo/server/branches/sachin/configs/rmi-naming/pom.xml
geronimo/server/branches/sachin/configs/system-database/pom.xml
geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml
geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/tomcat/pom.xml
geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml
geronimo/server/branches/sachin/configs/webconsole-jetty/src/plan/plan.xml
geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml
geronimo/server/branches/sachin/configs/webconsole-tomcat/src/plan/plan.xml
geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
geronimo/server/branches/sachin/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/pom.xml
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/GeronimoServletHttpRequest.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/InternalJAASJettyRealm.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JAASJettyPrincipal.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyContainer.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyManagerImpl.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletHolder.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyServletRegistration.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebContainerStatsImpl.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/NonAuthenticator.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/GeronimoSSLListener.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/connector/JettyConnector.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/interceptor/WebApplicationContextBeforeAfter.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/JettyLogManagerImpl.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/AbstractWebModuleTest.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/ClassLoaderTest.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/SecurityTest.java
geronimo/server/branches/sachin/modules/geronimo-jetty/src/test/java/org/apache/geronimo/jetty/connector/HTTPConnectorTest.java
geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java
geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java
geronimo/server/branches/sachin/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Modified: geronimo/server/branches/sachin/all_changes.log
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/all_changes.log?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/all_changes.log (original)
+++ geronimo/server/branches/sachin/all_changes.log Mon Sep 25 07:58:35 2006
@@ -18,7 +18,7 @@
Unnecessary, r366236 , janb , 2006-01-05 10:15:38 -0800 (Thu, 05 Jan 2006) , 2 lines adding the dependencies for wadi to the jetty container. had to add an extra repository to get the activemq-WADI-3.2 version - it would be good if there was another repo to get that from
Merged, r366603 , djencks , 2006-01-06 16:02:52 -0800 (Fri, 06 Jan 2006) , 1 line remove a couple of unused files
Merged, r366676 , djencks , 2006-01-06 21:37:04 -0800 (Fri, 06 Jan 2006) , 1 line GERONIMO-1427 First step towards separating openejb and axis into separate configs
-Not Merged, r366693 , janb , 2006-01-07 00:19:14 -0800 (Sat, 07 Jan 2006) , 2 lines removing axion and special activemq wadi versions and therefore jgenenders' codehaus repository from repo list
+Unnecessary, r366693 , janb , 2006-01-07 00:19:14 -0800 (Sat, 07 Jan 2006) , 2 lines removing axion and special activemq wadi versions and therefore jgenenders' codehaus repository from repo list
Not Merged, r367046 , adc , 2006-01-08 08:31:23 -0800 (Sun, 08 Jan 2006) , 3 lines PR: GERONIMO-1432 Removed wrapPrincipals attribute.
Unnecessary, r367122 , jsisson , 2006-01-08 15:15:17 -0800 (Sun, 08 Jan 2006) , 1 line GERONIMO-1395 - Fix accidental duplication of fixcrlf call in jelly code used whilst building the zip distribution. assembly plugin version bumped up to 1.1.3.
Not Merged, r367144 , ammulder , 2006-01-08 16:33:58 -0800 (Sun, 08 Jan 2006) , 2 lines Merge JavaDoc URL change from branch
@@ -51,12 +51,12 @@
Merged, r369125 , djencks , 2006-01-14 16:28:36 -0800 (Sat, 14 Jan 2006) , 1 line GERONIMO-1447 fix config names in plans
Merged, r369165 , djencks , 2006-01-14 18:29:39 -0800 (Sat, 14 Jan 2006) , 1 line GERONIMO-1457 Another version change
Unnecessary, r369276 , dain , 2006-01-15 15:16:51 -0800 (Sun, 15 Jan 2006) , 2 lines Add session module
-Not Merged, r369280 , jstrachan , 2006-01-15 15:36:05 -0800 (Sun, 15 Jan 2006) , 1 line A spike for a simple API for working with stateful session bean state from OpenEJB, ServiceMix or Tuscany; its very simple to use & has all thats required from the perspective of the client; we should be able to layer this on pretty much any implementation technology like WADI et al
+Unnecessary, r369280 , jstrachan , 2006-01-15 15:36:05 -0800 (Sun, 15 Jan 2006) , 1 line A spike for a simple API for working with stateful session bean state from OpenEJB, ServiceMix or Tuscany; its very simple to use & has all thats required from the perspective of the client; we should be able to layer this on pretty much any implementation technology like WADI et al
Merged, r369300 , djencks , 2006-01-15 17:27:18 -0800 (Sun, 15 Jan 2006) , 1 line GERONIMO-1457, maybe. Make sure a couple spec jars make it into lib
-Not Merged, r369309 , jstrachan , 2006-01-15 18:09:43 -0800 (Sun, 15 Jan 2006) , 1 line a simple local implementation of the Session to allow single-JVM session management which can offer optional persistence but no remote sessions
+Unnecessary, r369309 , jstrachan , 2006-01-15 18:09:43 -0800 (Sun, 15 Jan 2006) , 1 line a simple local implementation of the Session to allow single-JVM session management which can offer optional persistence but no remote sessions
Unnecessary, r369310 , jstrachan , 2006-01-15 18:14:00 -0800 (Sun, 15 Jan 2006) , 1 line Added missing dependencies to the pom
-Not Merged, r369313 , jstrachan , 2006-01-15 18:28:48 -0800 (Sun, 15 Jan 2006) , 1 line added a simple version of a remote-capable Locator which supports local or remote session objects which can be moved and new servers added or existing ones removed
-Not Merged, r369319 , jstrachan , 2006-01-15 18:47:07 -0800 (Sun, 15 Jan 2006) , 1 line added a little helper strategy for deciding whether to redirect, proxy or move when faced with a remote session
+Unnecessary, r369313 , jstrachan , 2006-01-15 18:28:48 -0800 (Sun, 15 Jan 2006) , 1 line added a simple version of a remote-capable Locator which supports local or remote session objects which can be moved and new servers added or existing ones removed
+Unnecessary, r369319 , jstrachan , 2006-01-15 18:47:07 -0800 (Sun, 15 Jan 2006) , 1 line added a little helper strategy for deciding whether to redirect, proxy or move when faced with a remote session
Unnecessary, r369321 , adc , 2006-01-15 19:04:41 -0800 (Sun, 15 Jan 2006) , 1 line Moved sandbox to a better place.
Merged, r369381 , djencks , 2006-01-15 23:33:37 -0800 (Sun, 15 Jan 2006) , 1 line GERONIMO-1477 turn off debug tool by default
Merged, r369383 , djencks , 2006-01-15 23:44:25 -0800 (Sun, 15 Jan 2006) , 1 line GERONIMO-1448 applied patch to web.xml and removed unused file geronimo-web.xml
@@ -282,7 +282,7 @@
Not Merged, r389206 , ammulder , 2006-03-27 09:43:21 -0800 (Mon, 27 Mar 2006) , 8 lines Use the new keystore manager to manage the default keystore distributed with Geronimo. Update the Jetty HTTPS connector to be configured by the keystore manager instead of by hardcoding files, passwords, etc. Update the console to allow unlocking a keystore and private key for use, and to make the create Jetty HTTPS connector configuration select from the available keystores (still need edit support)
Not Merged, r389296 , jgenender , 2006-03-27 13:50:11 -0800 (Mon, 27 Mar 2006) , 1 line GERONIMO-1705 and GERONIMO-973
Unnecessary, r389311 , chirino , 2006-03-27 14:19:34 -0800 (Mon, 27 Mar 2006) , 2 lines The build was not working without the corba dependency.
-Not Merged, r389341 , chirino , 2006-03-27 17:08:39 -0800 (Mon, 27 Mar 2006) , 5 lines - Upgrading ActiveMQ from 3.2.1 to 4.0-SNAPSHOT. On the next versioned release (RC2), we should switch to using that. - One of DLQ console portlet will not work anymore :( - A 3.2.1 copy of activemq-core is being brought in because OpenEJB is using WADI which still depends on 3.2.1
+Unnecessary, r389341 , chirino , 2006-03-27 17:08:39 -0800 (Mon, 27 Mar 2006) , 5 lines - Upgrading ActiveMQ from 3.2.1 to 4.0-SNAPSHOT. On the next versioned release (RC2), we should switch to using that. - One of DLQ console portlet will not work anymore :( - A 3.2.1 copy of activemq-core is being brought in because OpenEJB is using WADI which still depends on 3.2.1
Not Merged, r389577 , jgenender , 2006-03-28 11:01:53 -0800 (Tue, 28 Mar 2006) , 1 line Add patch for IE browser
Not Merged, r389606 , jgenender , 2006-03-28 13:24:04 -0800 (Tue, 28 Mar 2006) , 2 lines Change rounding to make download value zero based.
Not Merged, r389626 , kevan , 2006-03-28 15:22:33 -0800 (Tue, 28 Mar 2006) , 1 line Initial import.
Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Mon Sep 25 07:58:35 2006
@@ -34,12 +34,16 @@
import javax.portlet.WindowState;
import org.apache.geronimo.console.BasePortlet;
import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.kernel.DependencyManager;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationInfo;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.LifecycleException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.management.State;
@@ -144,6 +148,7 @@
List moduleDetails = new ArrayList();
ConfigurationManager configManager = ConfigurationUtil.getConfigurationManager(kernel);
+ DependencyManager depMgr = kernel.getDependencyManager();
List infos = configManager.listConfigurations();
for (Iterator j = infos.iterator(); j.hasNext();) {
ConfigurationInfo info = (ConfigurationInfo) j.next();
@@ -157,6 +162,52 @@
details.setUrlFor(webModule.getURLFor());
}
}
+ try {
+ AbstractName configObjName = Configuration.getConfigurationAbstractName(info.getConfigID());
+ boolean flag = false;
+ // Check if the configuration is loaded. If not, load it to get information.
+ if(!kernel.isLoaded(configObjName)) {
+ flag = true;
+ try {
+ configManager.loadConfiguration(configObjName.getArtifact());
+ } catch (NoSuchConfigException e) {
+ // Should not occur
+ e.printStackTrace();
+ } catch (LifecycleException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ java.util.Set parents = depMgr.getParents(configObjName);
+ for(Iterator itr = parents.iterator(); itr.hasNext(); ) {
+ AbstractName parent = (AbstractName)itr.next();
+ details.getParents().add(parent.getArtifact());
+ }
+ java.util.Set children = depMgr.getChildren(configObjName);
+ for(Iterator itr = children.iterator(); itr.hasNext(); ) {
+ AbstractName child = (AbstractName)itr.next();
+ //if(configManager.isConfiguration(child.getArtifact()))
+ if(child.getNameProperty("configurationName") != null) {
+ details.getChildren().add(child.getArtifact());
+ }
+ }
+ Collections.sort(details.getParents());
+ Collections.sort(details.getChildren());
+
+ // Unload the configuration if it has been loaded earlier for the sake of getting information
+ if(flag) {
+ try {
+ configManager.unloadConfiguration(configObjName.getArtifact());
+ } catch (NoSuchConfigException e) {
+ // Should not occur
+ e.printStackTrace();
+ }
+ }
+ } catch(InvalidConfigException ice) {
+ // Should not occur
+ ice.printStackTrace();
+ }
moduleDetails.add(details);
}
}
@@ -206,6 +257,8 @@
private final State state;
private URL urlFor; // only relevant for webapps
private String contextPath; // only relevant for webapps
+ private List parents = new ArrayList();
+ private List children = new ArrayList();
public ModuleDetails(Artifact configId, ConfigurationModuleType type, State state) {
this.configId = configId;
@@ -213,6 +266,14 @@
this.state = state;
}
+ public ModuleDetails(Artifact configId, ConfigurationModuleType type, State state, List parents, List children) {
+ this.configId = configId;
+ this.type = type;
+ this.state = state;
+ this.parents = parents;
+ this.children = children;
+ }
+
public int compareTo(Object o) {
if (o != null && o instanceof ModuleDetails){
return configId.compareTo(((ModuleDetails)o).configId);
@@ -247,6 +308,14 @@
public ConfigurationModuleType getType() {
return type;
+ }
+
+ public List getParents() {
+ return parents;
+ }
+
+ public List getChildren() {
+ return children;
}
}
}
Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Mon Sep 25 07:58:35 2006
@@ -10,6 +10,8 @@
<c:if test="${showWebInfo}"><th>URL</th></c:if>
<th> State</th>
<th align="center" colspan="3">Commands</th>
+ <th align="left">Parent Components</th>
+ <th align="left">Child Components</th>
</tr>
<c:set var="backgroundClass" value='MediumBackground'/>
<c:forEach var="moduleDetails" items="${configurations}">
@@ -37,6 +39,16 @@
</td>
<td width="75" class="${backgroundClass}">
<a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="uninstall"/></portlet:actionURL>" onClick="return confirm('Are you sure you want to uninstall ${moduleDetails.configId}?');">Uninstall</a>
+ </td>
+ <td class="${backgroundClass}">
+ <c:forEach var="parent" items="${moduleDetails.parents}">
+ ${parent} <br>
+ </c:forEach>
+ </td>
+ <td class="${backgroundClass}">
+ <c:forEach var="child" items="${moduleDetails.children}">
+ ${child} <br>
+ </c:forEach>
</td>
</tr>
</c:forEach>
Modified: geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Mon Sep 25 07:58:35 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/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml Mon Sep 25 07:58:35 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/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Mon Sep 25 07:58:35 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/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml Mon Sep 25 07:58:35 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/branches/sachin/bootstrap.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/bootstrap.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/bootstrap.xml (original)
+++ geronimo/server/branches/sachin/bootstrap.xml Mon Sep 25 07:58:35 2006
@@ -94,10 +94,7 @@
</target>
<target name="minimal" depends="init">
- <antcall target="clean">
- <param name="clean-minimal" value="true"/>
- </antcall>
-
+ <antcall target="clean"/>
<mvn goal="install"/>
</target>
@@ -116,7 +113,7 @@
<mkdir dir="${user.home}/.m2/repository"/>
</target>
- <target name="clean:minimal" depends="clean:init" if="clean-minimal">
+ <target name="clean:minimal" depends="clean:init" unless="clean-full">
<echo>Cleaning (minimal)...</echo>
<delete>
@@ -131,7 +128,7 @@
</delete>
</target>
- <target name="clean:full" depends="clean:init" unless="clean-minimal">
+ <target name="clean:full" depends="clean:init" if="clean-full">
<echo>Cleaning (full)...</echo>
<delete dir="${user.home}/.m2/repository"/>
@@ -149,7 +146,7 @@
<target name="openejb2" depends="init">
<echo>Building OpenEJB2...</echo>
- <build-external url="http://svn.codehaus.org/openejb/trunk/openejb2" name="openejb2"/>
+ <build-external url="https://svn.apache.org/repos/asf/incubator/openejb/trunk/openejb2" name="openejb2"/>
</target>
</project>
Modified: geronimo/server/branches/sachin/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/activemq/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/activemq/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/activemq/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-deployer/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/client-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client-deployer/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml Mon Sep 25 07:58:35 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>
Propchange: geronimo/server/branches/sachin/configs/client-transaction/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 25 07:58:35 2006
@@ -0,0 +1,7 @@
+ *.iml
+.project
+.classpath
+maven.log
+velocity.log
+junit*.properties
+target
Modified: geronimo/server/branches/sachin/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/client/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client/pom.xml Mon Sep 25 07:58:35 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
@@ -93,12 +85,6 @@
<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>
@@ -214,20 +200,6 @@
<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>
-
+
</project>
Modified: geronimo/server/branches/sachin/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/client/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/client/src/plan/plan.xml Mon Sep 25 07:58:35 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"/>
Propchange: geronimo/server/branches/sachin/configs/connector-deployer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 25 07:58:35 2006
@@ -0,0 +1,7 @@
+ *.iml
+.project
+.classpath
+maven.log
+velocity.log
+junit*.properties
+target
Modified: geronimo/server/branches/sachin/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-corba/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-corba/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-corba/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-security/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-security/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-server/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-server/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-server/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-server/src/plan/plan.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-system/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-system/src/plan/plan.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml Mon Sep 25 07:58:35 2006
@@ -40,7 +40,15 @@
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
+
+ <!--ResourceEnvironmentSetter-->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
<!-- similar thing not needed in tomcat !!! -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml Mon Sep 25 07:58:35 2006
@@ -54,14 +54,17 @@
<reference name="ClusteringBuilders">
<name>JettyClusteringBuilder</name>
</reference>
+ <reference name="ResourceEnvironmentSetter">
+ <name>ResourceRefBuilder</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>
+ <!--<dependency>-->
+ <!--<groupId>${pom.groupId}</groupId>-->
+ <!--<artifactId>j2ee-server</artifactId>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>jetty</artifactId>
Modified: geronimo/server/branches/sachin/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty/pom.xml Mon Sep 25 07:58:35 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/branches/sachin/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/openejb-deployer/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/openejb-deployer/pom.xml Mon Sep 25 07:58:35 2006
@@ -40,26 +40,20 @@
<version>${pom.version}</version>
<type>car</type>
</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-axis-builder</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-web-builder</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${pom.version}</version>
+ <type>car</type>
+ <scope>compile</scope>
</dependency>
-
- <!-- this should get openejb -->
+
<dependency>
<groupId>org.openejb</groupId>
<artifactId>openejb-builder</artifactId>
@@ -70,44 +64,6 @@
<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>
- <!--
- <groupId>org.apache.geronimo.specs</groupId>
- -->
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-corba</artifactId>
- </dependency>
-
</dependencies>
-
- <!--
- HACK: Need to include the Apache m1 snapshot repo to pick up geronimo-spec:geronimo-spec-corba
- -->
- <repositories>
- <repository>
- <id>apache-snapshots-m1</id>
- <name>Apache Maven 1 Snapshots Repository</name>
- <url>http://people.apache.org/repo/m1-snapshot-repository</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml Mon Sep 25 07:58:35 2006
@@ -46,6 +46,9 @@
<reference name="NamingBuilders">
<name>NamingBuilders</name>
</reference>
+ <reference name="ResourceEnvironmentSetter">
+ <name>ResourceRefBuilder</name>
+ </reference>
<reference name="ActivationSpecInfoLocator">
<name>ConnectorBuilder</name>
</reference>
@@ -72,6 +75,7 @@
<gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
<gbean name="OpenEjbRemoteRefBuilder" class="org.openejb.deployment.OpenEjbRemoteRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dependencies>
@@ -86,6 +90,7 @@
</gbean>
<gbean name="OpenEjbClientRemoteRefBuilder" class="org.openejb.deployment.OpenEjbClientRemoteRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanOpenEJBPort}</attribute>
<xml-attribute name="defaultEnvironment">
@@ -101,7 +106,9 @@
</xml-attribute>
</gbean>
- <gbean name="OpenEjbLocalRefBuilder" class="org.openejb.deployment.OpenEjbLocalRefBuilder"/>
+ <gbean name="OpenEjbLocalRefBuilder" class="org.openejb.deployment.OpenEjbLocalRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
+ </gbean>
<gbean name="CorbaRefBuilder" class="org.apache.geronimo.naming.deployment.CorbaRefBuilder">
<reference name="CorbaGBeanNameSource">
Modified: geronimo/server/branches/sachin/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/openejb/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/openejb/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/openejb/pom.xml Mon Sep 25 07:58:35 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>