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/03/24 10:12:09 UTC
svn commit: r388468 [1/2] - in /geronimo/branches/1.1:
configs/activemq-broker/src/plan/ configs/client-security/src/plan/
configs/client-system/src/plan/ configs/client/src/plan/
configs/console-jetty/src/plan/ configs/console-tomcat/src/plan/ configs...
Author: djencks
Date: Fri Mar 24 01:12:03 2006
New Revision: 388468
URL: http://svn.apache.org/viewcvs?rev=388468&view=rev
Log:
Fix numerous bugs, building configs seems to work except for ears with wars inside.
Added:
geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
Modified:
geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
geronimo/branches/1.1/configs/client-security/src/plan/plan.xml
geronimo/branches/1.1/configs/client-system/src/plan/plan.xml
geronimo/branches/1.1/configs/client/src/plan/plan.xml
geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-server/project.xml
geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml
geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/jetty/src/plan/plan.xml
geronimo/branches/1.1/configs/system-database/src/plan/plan.xml
geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml
geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationResolver.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
geronimo/branches/1.1/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-config-1.1.xsd
geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/plugin.properties
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
Modified: geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/activemq-broker/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -23,18 +23,18 @@
<!-- management -->
- <gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean" />
+ <!-- TODO configid interface change -->
+ <!--<gbean name="ActiveMQ" class="org.activemq.gbean.management.ActiveMQManagerGBean" />-->
<!-- message broker -->
<gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">
<attribute name="brokerName">possibly-unique-broker</attribute>
- <reference name="persistenceAdapter"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</gbean-name></reference>
-<!-- <reference name="ConnectorCollection"><gbean-name>geronimo.server:j2eeType=JMSConnector,broker=ActiveMQ,*</gbean-name></reference>-->
+ <reference name="persistenceAdapter"><name>ActiveMQ.cache</name></reference>
</gbean>
<gbean name="ActiveMQ.cache" class="org.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
<attribute name="cacheSize">10000</attribute>
- <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</gbean-name></reference>
+ <reference name="longTermPersistence"><name>ActiveMQ.journal</name></reference>
</gbean>
<gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
@@ -42,25 +42,25 @@
<reference name="serverInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><type>GBean</type><name>ServerInfo</name></reference>
<attribute name="directory">var/activemq/journal</attribute>
<attribute name="journalType">default</attribute>
- <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</gbean-name></reference>
+ <reference name="longTermPersistence"><name>ActiveMQ.jdbc</name></reference>
</gbean>
<gbean name="ActiveMQ.jdbc" class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
- <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/system-database/${pom.currentVersion}/car,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
+ <reference name="dataSource"><name>SystemDatasource</name></reference>
</gbean>
- <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
+ <gbean name="ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="protocol">tcp</attribute>
<attribute name="host">localhost</attribute>
<attribute name="port">61616</attribute>
- <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
+ <reference name="activeMQContainer"><name>ActiveMQ</name></reference>
</gbean>
- <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.vm.localhost" class="org.activemq.gbean.ActiveMQConnectorGBean">
+ <gbean name="ActiveMQ.vm.localhost" class="org.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="protocol">vm</attribute>
<attribute name="host">localhost</attribute>
<attribute name="port">-1</attribute>
- <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
+ <reference name="activeMQContainer"><name>ActiveMQ</name></reference>
</gbean>
<gbean name="SystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
Modified: geronimo/branches/1.1/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-security/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-security/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -24,7 +24,6 @@
-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
-
>
@@ -46,10 +45,10 @@
<gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
<references name="Configurations">
<pattern>
- <gbean-name>geronimo.client:j2eeType=SecurityRealm,*</gbean-name>
+ <type>SecurityRealm</type>
</pattern>
<pattern>
- <gbean-name>geronimo.client:j2eeType=ConfigurationEntry,*</gbean-name>
+ <type>ConfigurationEntry</type>
</pattern>
</references>
</gbean>
@@ -79,7 +78,7 @@
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">client-properties-realm</attribute>
<xml-reference name="LoginModuleConfiguration">
- <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.0">
+ <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.1">
<lc:login-module control-flag="REQUIRED" server-side="true" wrap-principals="true">
<lc:login-domain-name>client-properties-realm</lc:login-domain-name>
<lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>
Modified: geronimo/branches/1.1/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client-system/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client-system/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -37,13 +37,13 @@
<!-- Configuration Manager service -->
<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.KernelConfigurationManager">
<reference name="Stores">
- <gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>
+ <!--<gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>-->
</reference>
<reference name="AttributeStore">
<name>AttributeManager</name>
</reference>
<reference name="PersistentConfigurationList">
- <type>AttributeStore</type>
+ <!--<type>AttributeStore</type>-->
<name>AttributeManager</name>
</reference>
</gbean>
Modified: geronimo/branches/1.1/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/client/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/client/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/client/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!-- $Rev: 377921 $ $Date$ -->
+<!-- $Rev$ $Date$ -->
<!--
Configuration for the main ring of a Geronimo app client.
@@ -66,10 +66,10 @@
<reference name="XidFactory"><name>XidFactory</name></reference>
<references name="ResourceManagers">
<pattern>
- <gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name>
+ <type>JCAManagedConnectionFactory</type>
</pattern>
<pattern>
- <gbean-name>*:j2eeType=ActivationSpec,*</gbean-name>
+ <type>ActivationSpec</type>
</pattern>
</references>
</gbean>
Modified: geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -52,15 +52,15 @@
<!-- Console specific server info -->
<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
<reference name="ServerInfo">
- <application>null</application>
- <moduleType>J2EEModule</moduleType>
- <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
+ <!--<application>null</application>-->
+ <!--<moduleType>J2EEModule</moduleType>-->
+ <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
<reference name="LoginModule">
- <application>null</application>
- <moduleType>J2EEModule</moduleType>
- <module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>
+ <!--<application>null</application>-->
+ <!--<moduleType>J2EEModule</moduleType>-->
+ <!--<module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>-->
<name>properties-login</name>
</reference>
</gbean>
@@ -72,9 +72,9 @@
<attribute name="keyStoreProvider">SUN</attribute>
<attribute name="keyStorePassword">password</attribute>
<reference name="serverInfo">
- <application>null</application>
- <moduleType>J2EEModule</moduleType>
- <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
+ <!--<application>null</application>-->
+ <!--<moduleType>J2EEModule</moduleType>-->
+ <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
</gbean>
Modified: geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -54,15 +54,15 @@
<!-- Console specific server info -->
<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
<reference name="ServerInfo">
- <application>null</application>
- <moduleType>J2EEModule</moduleType>
- <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
+ <!--<application>null</application>-->
+ <!--<moduleType>J2EEModule</moduleType>-->
+ <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
<reference name="LoginModule">
- <application>null</application>
- <moduleType>J2EEModule</moduleType>
- <module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>
+ <!--<application>null</application>-->
+ <!--<moduleType>J2EEModule</moduleType>-->
+ <!--<module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>-->
<name>properties-login</name>
</reference>
</gbean>
@@ -74,9 +74,9 @@
<attribute name="keyStoreProvider">SUN</attribute>
<attribute name="keyStorePassword">password</attribute>
<reference name="serverInfo">
- <application>null</application>
- <moduleType>J2EEModule</moduleType>
- <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
+ <!--<application>null</application>-->
+ <!--<moduleType>J2EEModule</moduleType>-->
+ <!--<module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
</gbean>
Modified: geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/geronimo-gbean-deployer/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -29,28 +29,27 @@
<!-- Deployer used to process modules and plans -->
<gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
- <references name="Store">
- <pattern><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></pattern>
- </references>
+ <reference name="Store">
+ <!--<pattern><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></pattern>-->
+ </reference>
<reference name="Builders">
- <gbean-name>*:j2eeType=ConfigBuilder,*</gbean-name>
</reference>
</gbean>
<!-- Builder for handling plans defining Geronimo configurations -->
<gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<!--<attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>-->
- <references name="Repository">
- <pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>
- <pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>
- </references>
+ <reference name="Repository">
+ <!--<pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>-->
+ <!--<pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>-->
+ </reference>
<reference name="XmlAttributeBuilders">
- <module>*</module>
- <name>*</name>
+ <!--<module>*</module>-->
+ <!--<name>*</name>-->
</reference>
<reference name="XmlReferenceBuilders">
- <module>*</module>
- <name>*</name>
+ <!--<module>*</module>-->
+ <!--<name>*</name>-->
</reference>
</gbean>
Modified: geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -23,15 +23,14 @@
<gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<!--domain set to wildcard so datasources may be deployed independently on client. -->
<!--a better solution is to get the domain and server from the parent configuration -->
- <attribute name="transactionContextManagerObjectName">*:name=TransactionContextManager,*</attribute>
- <attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
- <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
- <attribute name="nonTransactionalTimerObjectName">
- geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
- <attribute name="corbaGBeanObjectName">
- geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
- <reference name="Repository">
- <gbean-name>*:name=Repository,*</gbean-name>
+ <attribute name="transactionContextManagerAbstractName">?name=TransactionContextManager</attribute>
+ <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
+ <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>
+ <attribute name="nonTransactionalTimerAbstractName">?name=NonTransactionalThreadPooledTimer</attribute>
+ <attribute name="corbaGBeanAbstractName">?name=Server</attribute>
+ <attribute name="serverName">?j2eeType=J2EEServer#org.apache.geronimo.management.geronimo.J2EEServer</attribute>
+ <reference name="Repositories">
+ <!--<gbean-name>*:name=Repository,*</gbean-name>-->
</reference>
<reference name="WebConfigBuilder">
<name>WebBuilder</name>
@@ -73,28 +72,22 @@
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
<references name="ModuleBuilders">
<pattern>
- <gbean-name>
- geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name>
+ <name>JettyWebBuilder</name>
</pattern>
<pattern>
- <gbean-name>
- geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name>
+ <name>TomcatWebBuilder</name>
</pattern>
</references>
</gbean>
<gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
- <attribute name="listener">
- geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
+ <attribute name="listener">?name=WebContainer</attribute>
<reference name="WebServiceLinkTemplate">
<name>WebServiceEJBLinkTemplate</name>
</reference>
<reference name="WebServiceBuilder">
<name>WebServiceBuilder</name>
</reference>
- <reference name="Repository">
- <gbean-name>*:name=Repository,*</gbean-name>
- </reference>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dependencies>
@@ -131,11 +124,9 @@
</gbean>
<gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
- <attribute name="transactionContextManagerObjectName">
- geronimo.client:name=TransactionContextManager,*</attribute>
- <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
- <attribute name="corbaGBeanObjectName">
- geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server</attribute>
+ <attribute name="transactionContextManagerObjectName">?name=TransactionContextManager</attribute>
+ <attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
+ <attribute name="corbaGBeanObjectName">?name=Server</attribute>
<reference name="EJBReferenceBuilder">
<name>ClientEJBReferenceBuilder</name>
</reference>
Modified: geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -40,8 +40,8 @@
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler -->
<gbean name="LoginConfiguration" class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
<references name="Configurations">
- <pattern><gbean-name>geronimo.server:j2eeType=SecurityRealm,*</gbean-name></pattern>
- <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationEntry,*</gbean-name></pattern>
+ <pattern><type>SecurityRealm</type></pattern>
+ <pattern><type>ConfigurationEntry</type></pattern>
</references>
</gbean>
Modified: geronimo/branches/1.1/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/project.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/project.xml Fri Mar 24 01:12:03 2006
@@ -242,7 +242,7 @@
<artifactId>geronimo-activation</artifactId>
<version>${geronimo_version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
<version>${geronimo_version}</version>
@@ -251,7 +251,7 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${geronimo_version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
Modified: geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!-- $Rev: 377921 $ $Date$ -->
+<!-- $Rev$ $Date$ -->
<!--
Configuration for the main ring of a Geronimo server.
@@ -73,8 +73,8 @@
<reference name="XidFactory"><name>XidFactory</name></reference>
<reference name="TransactionLog"><name>HOWLTransactionLog</name></reference>
<references name="ResourceManagers">
- <pattern><gbean-name>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
- <pattern><gbean-name>geronimo.server:j2eeType=ActivationSpec,*</gbean-name></pattern>
+ <pattern><type>JCAManagedConnectionFactory</type></pattern>
+ <pattern><type>ActivationSpec</type></pattern>
</references>
</gbean>
@@ -84,7 +84,7 @@
</gbean>
<!-- EJB Protocol -->
- <gbean gbeanName="geronimo:type=NetworkService,name=EJB" class="org.activeio.xnet.StandardServiceStackGBean">
+ <gbean name="EJBNetworkService" class="org.activeio.xnet.StandardServiceStackGBean">
<attribute name="name">EJB</attribute>
<attribute name="port">${PlanOpenEJBPort}</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
@@ -92,38 +92,38 @@
<attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
<attribute name="logOnFailure">HOST,NAME</attribute>
<reference name="Executor"><name>DefaultThreadPool</name></reference>
- <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
+ <reference name="Server"><name>EJBServer</name></reference>
</gbean>
- <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
+
+ <gbean name="EJBServer" class="org.openejb.server.ejbd.EjbServerGBean">
<reference name="ContainerIndex">
- <gbean-name>openejb:type=ContainerIndex</gbean-name>
+ <name>ContainerIndex</name>
</reference>
<reference name="ORBRefs">
- <module>*</module>
<name>Server</name>
</reference>
</gbean>
<!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
- <gbean gbeanName="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
+ <gbean name="ContainerIndex" class="org.openejb.ContainerIndex">
<references name="EJBContainers">
- <pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
- <pattern><gbean-name>geronimo.server:j2eeType=StatefulSessionBean,*</gbean-name></pattern>
- <pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
+ <pattern><type>StatelessSessionBean</type></pattern>
+ <pattern><type>StatefulSessionBean</type></pattern>
+ <pattern><type>EntityBean</type></pattern>
</references>
</gbean>
<!-- JSR77 Management Objects -->
- <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
- <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
- <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
+ <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+ <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
- <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
+ <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
- <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+ <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
<gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
Modified: geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -75,14 +75,14 @@
<name>ArtifactManager</name>
</reference>
<reference name="Repositories">
- <gbean-name>*:name=Repository,*</gbean-name>
+ <!--<gbean-name>*:name=Repository,*</gbean-name>-->
</reference>
</gbean>
<!--Configuration Manager service-->
<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
<reference name="Stores">
- <gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>
+ <!--<gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>-->
</reference>
<reference name="AttributeStore">
<name>AttributeManager</name>
Modified: geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -27,7 +27,7 @@
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
<attribute name="defaultContextPriorityClassloader">false</attribute>
<attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
- <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
+ <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
<reference name="DefaultServlets">
<!--gbean-name>geronimo.maven:j2eeType=DefaultServlet,J2EEModule=${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car,*</gbean-name-->
<name>*</name>
@@ -36,7 +36,7 @@
<name>POJOTemplate</name>
</reference>
<reference name="WebServiceBuilder">
- <module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>
+ <!--<module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>-->
<name>WebServiceBuilder</name>
</reference>
<xml-attribute name="defaultEnvironment">
Modified: geronimo/branches/1.1/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -37,7 +37,7 @@
<references name="LogGBeans">
<pattern>
<!-- This is lame and should be replaced by an interface reference -->
- <gbean-name>geronimo.server:name=JettyRequestLog,*</gbean-name>
+ <name>JettyRequestLog</name>
</pattern>
</references>
<reference name="ServerInfo">
@@ -56,7 +56,7 @@
<name>JettyWebContainer</name>
</reference>
<reference name="ServerInfo">
- <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+ <!--<module>geronimo/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
<attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
@@ -103,7 +103,7 @@
<name>JettyWebContainer</name>
</reference>
<reference name="ServerInfo">
- <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+ <!--<module>geronimo/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
</gbean>
Modified: geronimo/branches/1.1/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/system-database/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/system-database/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -47,34 +47,31 @@
</resourceadapter>
<gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
- <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
<attribute name="derbySystemHome">var/derby</attribute>
</gbean>
<gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+ <reference name="derbySystem"><name>DerbySystem</name></reference>
<attribute name="host">localhost</attribute>
<attribute name="port">1527</attribute>
</gbean>
<gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+ <reference name="DerbySystem"><name>DerbySystem</name></reference>
</gbean>
<gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
<attribute name="repeatCount">5</attribute>
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+ <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
+ <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
+ <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
+ <reference name="DerbySystem"><name>DerbySystem</name></reference>
</gbean>
<gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
- <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>TransactionContextManager</name></reference>
- <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
- <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>DefaultThreadPool</name></reference>
- <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
- <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
+ <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
+ <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
+ <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
+ <reference name="DerbySystem"><name>DerbySystem</name></reference>
</gbean>
</connector>
Modified: geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -24,7 +24,7 @@
<attribute name="defaultContextPriorityClassloader">false</attribute>
<attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
<reference name="WebServiceBuilder">
- <module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>
+ <!--<module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>-->
<name>WebServiceBuilder</name>
</reference>
<xml-attribute name="defaultEnvironment">
Modified: geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat/src/plan/plan.xml Fri Mar 24 01:12:03 2006
@@ -124,7 +124,7 @@
</reference>
<references name="Hosts">
<pattern>
- <gbean-name>geronimo.server:j2eeType=Host,*</gbean-name>
+ <type>Host</type>
</pattern>
</references>
<reference name="RealmGBean">
@@ -141,12 +141,12 @@
<gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
<reference name="ServerInfo">
- <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+ <!--<module>geronimo/j2ee-system/${pom.currentVersion}/car</module>-->
<name>ServerInfo</name>
</reference>
<references name="LogGBeans">
<pattern>
- <gbean-name>geronimo.server:name=FirstValve,*</gbean-name>
+ <name>FirstValve</name>
</pattern>
</references>
</gbean>
Modified: geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri Mar 24 01:12:03 2006
@@ -66,7 +66,6 @@
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import javax.management.ObjectName;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -246,7 +245,7 @@
return geronimoAppClient;
}
- public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
+ public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
// extract the app client jar file into a standalone packed jar file and add the contents to the output
JarFile moduleFile = module.getModuleFile();
try {
@@ -267,7 +266,7 @@
AbstractName clientBaseName = earContext.getNaming().createRootName(clientEnvironment.getConfigId(), clientEnvironment.getConfigId().toString(), NameFactory.APP_CLIENT_MODULE);
File appClientDir;
try {
- appClientDir = configurationStore.createNewConfigurationDir(clientEnvironment.getConfigId());
+ appClientDir = targetConfigurationStore.createNewConfigurationDir(clientEnvironment.getConfigId());
} catch (ConfigurationAlreadyExistsException e) {
throw new DeploymentException(e);
}
@@ -279,8 +278,8 @@
clientEnvironment,
ConfigurationModuleType.CAR,
earContext.getNaming(),
- repository,
- configurationStore,
+ repositories,
+ configurationStores,
null, //no server name needed on client
clientBaseName,
transactionContextManagerObjectName,
@@ -300,7 +299,7 @@
public void initContext(EARContext earContext, Module clientModule, ClassLoader cl) {
}
- public void addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader, Repository repository) throws DeploymentException {
+ public void addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader, Collection repositories) throws DeploymentException {
AppClientModule appClientModule = (AppClientModule) module;
@@ -389,10 +388,17 @@
if (resource.isSetExternalRar()) {
path = resource.getExternalRar().trim();
Artifact artifact = Artifact.create(path);
- if (!repository.contains(artifact)) {
- throw new DeploymentException("Missing rar in repository: " + path);
+ File file = null;
+ for (Iterator iterator = repositories.iterator(); iterator.hasNext();) {
+ Repository repository = (Repository) iterator.next();
+ if (repository.contains(artifact)) {
+ file = repository.getLocation(artifact);
+ break;
+ }
+ }
+ if (file == null) {
+ throw new DeploymentException("Missing rar in repositories: " + path);
}
- File file = repository.getLocation(artifact);
try {
connectorFile = new JarFile(file);
} catch (IOException e) {
@@ -410,7 +416,7 @@
Module connectorModule = connectorModuleBuilder.createModule(connectorPlan, connectorFile, path, null, null, null, appClientDeploymentContext.getModuleName(), earContext.getNaming());
resourceModules.add(connectorModule);
//TODO configStore == null is fishy, consider moving these stages for connectors into the corresponding stages for this module.
- connectorModuleBuilder.installModule(connectorFile, appClientDeploymentContext, connectorModule, null, repository);
+ connectorModuleBuilder.installModule(connectorFile, appClientDeploymentContext, connectorModule, null, null, repositories);
}
//the install step could have added more dependencies... we need a new cl.
appClientClassLoader = appClientDeploymentContext.getClassLoader();
@@ -421,7 +427,7 @@
for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();) {
Module connectorModule = (Module) iterator.next();
- connectorModuleBuilder.addGBeans(appClientDeploymentContext, connectorModule, appClientClassLoader, repository);
+ connectorModuleBuilder.addGBeans(appClientDeploymentContext, connectorModule, appClientClassLoader, repositories);
}
} finally {
for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();) {
Added: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java?rev=388468&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java (added)
+++ geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java Fri Mar 24 01:12:03 2006
@@ -0,0 +1,41 @@
+/**
+ *
+ * Copyright 2006 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.
+ */
+
+package org.apache.geronimo.common.propertyeditor;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.geronimo.gbean.AbstractName;
+
+/**
+ *
+ *
+ * @version $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (Sun, 11 Dec 2005) $
+ *
+ * */
+public class AbstractNameEditor extends TextPropertyEditorSupport {
+
+ public Object getValue() {
+ try {
+ return new AbstractName(new URI(getAsText()));
+ } catch (URISyntaxException e) {
+ throw new PropertyEditorException(e);
+ }
+ }
+
+}
Added: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java?rev=388468&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java (added)
+++ geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java Fri Mar 24 01:12:03 2006
@@ -0,0 +1,41 @@
+/**
+ *
+ * Copyright 2006 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.
+ */
+
+package org.apache.geronimo.common.propertyeditor;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.geronimo.gbean.AbstractNameQuery;
+
+/**
+ *
+ *
+ * @version $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (Sun, 11 Dec 2005) $
+ *
+ * */
+public class AbstractNameQueryEditor extends TextPropertyEditorSupport {
+
+ public Object getValue() {
+ try {
+ return new AbstractNameQuery(new URI(getAsText()));
+ } catch (URISyntaxException e) {
+ throw new PropertyEditorException(e);
+ }
+ }
+
+}
Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Fri Mar 24 01:12:03 2006
@@ -63,7 +63,6 @@
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
import org.apache.geronimo.naming.reference.ResourceReference;
import org.apache.geronimo.schema.SchemaConversionUtils;
@@ -108,6 +107,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.Collection;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
@@ -239,7 +239,7 @@
return new ConnectorModule(standAlone, moduleName, environment, moduleFile, targetPath, connector, gerConnector, specDD);
}
- public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
+ public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
try {
JarFile moduleFile = module.getModuleFile();
@@ -358,7 +358,7 @@
}
- public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Repository repository) throws DeploymentException {
+ public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException {
//all our gbeans are added in the initContext step
}
Modified: geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Fri Mar 24 01:12:03 2006
@@ -168,7 +168,7 @@
try {
File planFile = new File(basedir, "src/test-data/data/external-application-plan.xml");
Object plan = configBuilder.getDeploymentPlan(planFile, rarFile);
- configData = configBuilder.buildConfiguration(plan, rarFile, configurationStore);
+ configData = configBuilder.buildConfiguration(plan, rarFile, Collections.singleton(configurationStore), configurationStore);
} finally {
if (configData != null) {
DeploymentUtil.recursiveDelete(configData.getConfigurationDir());
@@ -327,7 +327,7 @@
action.install(moduleBuilder, earContext, module, configurationStore);
earContext.getClassLoader();
moduleBuilder.initContext(earContext, module, cl);
- moduleBuilder.addGBeans(earContext, module, cl, repository);
+ moduleBuilder.addGBeans(earContext, module, cl, Collections.singleton(repository));
ConfigurationData configurationData = earContext.getConfigurationData();
AbstractName moduleAbstractName = earContext.getModuleName();
@@ -521,7 +521,7 @@
public abstract File getRARFile();
public void install(ModuleBuilder moduleBuilder, EARContext earContext, Module module, ConfigurationStore configurationStore) throws Exception {
- moduleBuilder.installModule(module.getModuleFile(), earContext, module, configurationStore, repository);
+ moduleBuilder.installModule(module.getModuleFile(), earContext, module, Collections.singleton(configurationStore), configurationStore, Collections.singleton(repository));
}
}
Modified: geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java (original)
+++ geronimo/branches/1.1/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Fri Mar 24 01:12:03 2006
@@ -21,6 +21,7 @@
import java.net.URI;
import java.net.URL;
import java.util.List;
+import java.util.Collections;
import java.util.jar.JarOutputStream;
import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
@@ -35,7 +36,7 @@
import org.apache.geronimo.system.repository.Maven1Repository;
/**
- * @version $Rev: 383067 $ $Date$
+ * @version $Rev$ $Date$
*/
public class PluginBootstrap {
private File localRepo;
@@ -67,8 +68,8 @@
ConfigurationType config = ConfigurationDocument.Factory.parse(plan).getConfiguration();
Maven1Repository repository = new Maven1Repository(localRepo);
- ServiceConfigBuilder builder = new ServiceConfigBuilder(null, repository, new Jsr77Naming());
- ConfigurationData configurationData = builder.buildConfiguration(config, null, new ConfigurationStore() {
+ ServiceConfigBuilder builder = new ServiceConfigBuilder(null, Collections.singleton(repository), new Jsr77Naming());
+ ConfigurationStore targetConfigurationStore = new ConfigurationStore() {
public void install(ConfigurationData configurationData) {
}
@@ -98,7 +99,8 @@
public URL resolve(Artifact configId, URI uri) {
return null;
}
- });
+ };
+ ConfigurationData configurationData = builder.buildConfiguration(config, null, Collections.singleton(targetConfigurationStore), targetConfigurationStore);
JarOutputStream out = new JarOutputStream(new FileOutputStream(carFile));
ExecutableConfigurationUtil.writeConfiguration(configurationData, out);
Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/ConfigurationBuilder.java Fri Mar 24 01:12:03 2006
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.IOException;
import java.util.jar.JarFile;
+import java.util.Collection;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -55,10 +56,11 @@
*
* @param plan the deployment plan
* @param module the module to build
- * @param configurationStore
+ * @param configurationStores
+ * @param targetConfigurationStore
* @return the Configuration information
* @throws IOException if there was a problem reading or writing the files
* @throws org.apache.geronimo.common.DeploymentException if there was a problem with the configuration
*/
- ConfigurationData buildConfiguration(Object plan, JarFile module, ConfigurationStore configurationStore) throws IOException, DeploymentException;
+ ConfigurationData buildConfiguration(Object plan, JarFile module, Collection configurationStores, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException;
}
Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java Fri Mar 24 01:12:03 2006
@@ -65,12 +65,12 @@
private final Properties pendingDeletionIndex = new Properties();
private DeployerReaper reaper;
private final Collection builders;
- private final ConfigurationStore store;
+ private final Collection stores;
private final Kernel kernel;
- public Deployer(Collection builders, ConfigurationStore store, Kernel kernel) {
+ public Deployer(Collection builders, Collection stores, Kernel kernel) {
this.builders = builders;
- this.store = store;
+ this.stores = stores;
this.kernel = kernel;
// Create and start the reaper...
@@ -271,22 +271,19 @@
manifest = null;
}
-//TODO this is ludicrous! give the builder a location factory!
- // create a configuration dir to write the configuration during the building proces
-// configurationDir = store.createNewConfigurationDir();
-
- // create te meta-inf dir
-// File metaInf = new File(configurationDir, "META-INF");
-// metaInf.mkdirs();
-
- ConfigurationData configurationData = builder.buildConfiguration(plan, module, store);
+ //TODO adapt to multiple config stores!
+ if (stores.isEmpty()) {
+ throw new DeploymentException("No ConfigurationStores!");
+ }
+ ConfigurationStore store = (ConfigurationStore) stores.iterator().next();
+ ConfigurationData configurationData = builder.buildConfiguration(plan, module, stores, store);
try {
if (targetFile != null) {
ExecutableConfigurationUtil.createExecutableConfiguration(configurationData, manifest, targetFile);
}
if (install) {
List deployedURIs = new ArrayList();
- recursiveInstall(configurationData, deployedURIs);
+ recursiveInstall(configurationData, deployedURIs, store);
return deployedURIs;
} else {
cleanupConfigurationDirs(configurationData);
@@ -335,12 +332,12 @@
}
}
- private void recursiveInstall(ConfigurationData configurationData, List deployedURIs) throws IOException, InvalidConfigException {
+ private void recursiveInstall(ConfigurationData configurationData, List deployedURIs, ConfigurationStore store) throws IOException, InvalidConfigException {
store.install(configurationData);
deployedURIs.add(configurationData.getId().toString());
for (Iterator iterator = configurationData.getChildConfigurations().iterator(); iterator.hasNext();) {
ConfigurationData childConfiguration = (ConfigurationData) iterator.next();
- recursiveInstall(childConfiguration, deployedURIs);
+ recursiveInstall(childConfiguration, deployedURIs, store);
}
}
Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Fri Mar 24 01:12:03 2006
@@ -246,12 +246,12 @@
* @throws IOException if there's a problem copying the ZIP entry
*/
public void addInclude(URI targetPath, ZipFile zipFile, ZipEntry zipEntry) throws IOException {
- if (!targetPath.getPath().endsWith("/")) throw new IllegalStateException("target path must end with a '/' character: " + targetPath);
+// if (!targetPath.getPath().endsWith("/")) throw new IllegalStateException("target path must end with a '/' character: " + targetPath);
File targetFile = getTargetFile(targetPath);
addFile(targetFile, zipFile, zipEntry);
- if (!targetFile.isDirectory()) throw new IllegalStateException("target file should be a directory: " + targetFile);
+// if (!targetFile.isDirectory()) throw new IllegalStateException("target file should be a directory: " + targetFile);
configuration.addToClassPath(targetPath);
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Fri Mar 24 01:12:03 2006
@@ -72,6 +72,7 @@
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import java.util.Collection;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
@@ -83,7 +84,7 @@
private final static QName APPLICATION_QNAME = GerApplicationDocument.type.getDocumentElementName();
private static final String DEFAULT_GROUPID = "defaultGroupId";
- private final Repository repository;
+ private final Collection repositories;
private final ModuleBuilder ejbConfigBuilder;
private final ModuleBuilder webConfigBuilder;
private final ModuleBuilder connectorConfigBuilder;
@@ -109,7 +110,7 @@
AbstractNameQuery nonTransactionalTimerAbstractName,
AbstractNameQuery corbaGBeanAbstractName,
AbstractNameQuery serverName,
- Repository repository,
+ Collection repositories,
ModuleBuilder ejbConfigBuilder,
EJBReferenceBuilder ejbReferenceBuilder,
ModuleBuilder webConfigBuilder,
@@ -125,7 +126,7 @@
nonTransactionalTimerAbstractName,
corbaGBeanAbstractName,
serverName,
- repository,
+ repositories,
ejbConfigBuilder,
ejbReferenceBuilder,
webConfigBuilder,
@@ -143,7 +144,7 @@
AbstractNameQuery nonTransactionalTimerAbstractName,
AbstractNameQuery corbaGBeanAbstractName,
AbstractNameQuery serverName,
- Repository repository,
+ Collection repositories,
ModuleBuilder ejbConfigBuilder,
EJBReferenceBuilder ejbReferenceBuilder,
ModuleBuilder webConfigBuilder,
@@ -152,7 +153,7 @@
ModuleBuilder appClientConfigBuilder,
ServiceReferenceBuilder serviceReferenceBuilder,
Naming naming) {
- this.repository = repository;
+ this.repositories = repositories;
this.defaultEnvironment = defaultEnvironment;
this.ejbConfigBuilder = ejbConfigBuilder;
@@ -333,7 +334,7 @@
return applicationInfo.getEnvironment().getConfigId();
}
- public ConfigurationData buildConfiguration(Object plan, JarFile earFile, ConfigurationStore configurationStore) throws IOException, DeploymentException {
+ public ConfigurationData buildConfiguration(Object plan, JarFile earFile, Collection configurationStores, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException {
assert plan != null;
ApplicationInfo applicationInfo = (ApplicationInfo) plan;
try {
@@ -344,7 +345,7 @@
Artifact configId = environment.getConfigId();
File configurationDir;
try {
- configurationDir = configurationStore.createNewConfigurationDir(configId);
+ configurationDir = targetConfigurationStore.createNewConfigurationDir(configId);
} catch (ConfigurationAlreadyExistsException e) {
throw new DeploymentException(e);
}
@@ -352,8 +353,8 @@
applicationInfo.getEnvironment(),
applicationType,
naming,
- repository,
- configurationStore,
+ repositories,
+ configurationStores,
serverName,
applicationInfo.getBaseName(),
transactionContextManagerObjectName,
@@ -380,7 +381,7 @@
Set modules = applicationInfo.getModules();
for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
Module module = (Module) iterator.next();
- getBuilder(module).installModule(earFile, earContext, module, configurationStore, repository);
+ getBuilder(module).installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);
}
// give each module a chance to populate the earContext now that a classloader is available
@@ -418,19 +419,19 @@
earContext.setSecurityConfiguration(securityConfiguration);
}
- // each module can now add it's GBeans
- for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
- Module module = (Module) iterator.next();
- getBuilder(module).addGBeans(earContext, module, cl, repository);
- }
-
//add the JACC gbean if there is a principal-role mapping
- //TODO configid verify that the jaccManagerName is not needed before this. cf. how this is handled in 1.2 branch.
if (earContext.getSecurityConfiguration() != null) {
GBeanData jaccBeanData = SecurityBuilder.configureApplicationPolicyManager(naming, earContext.getModuleName(), earContext.getContextIDToPermissionsMap(), earContext.getSecurityConfiguration());
earContext.addGBean(jaccBeanData);
earContext.setJaccManagerName(jaccBeanData.getAbstractName());
}
+
+ // each module can now add it's GBeans
+ for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
+ Module module = (Module) iterator.next();
+ getBuilder(module).addGBeans(earContext, module, cl, repositories);
+ }
+
ConfigurationData configurationData = earContext.getConfigurationData();
earContext.close();
return configurationData;
@@ -637,10 +638,17 @@
} else {
String path = gerExtModule.getExternalPath().trim();
Artifact artifact = Artifact.create(path);
- if (!repository.contains(artifact)) {
- throw new DeploymentException(moduleTypeName + " is missing in repository: " + path);
+ File location = null;
+ for (Iterator iterator = repositories.iterator(); iterator.hasNext();) {
+ Repository repository = (Repository) iterator.next();
+ if (repository.contains(artifact)) {
+ location = repository.getLocation(artifact);
+ break;
+ }
+ }
+ if (location == null) {
+ throw new DeploymentException(moduleTypeName + " is missing in repositories: " + path);
}
- File location = repository.getLocation(artifact);
try {
moduleFile = new JarFile(location);
} catch (IOException e) {
@@ -726,7 +734,7 @@
infoFactory.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
infoFactory.addAttribute("serverName", AbstractNameQuery.class, true);
- infoFactory.addReference("Repository", Repository.class, NameFactory.GERONIMO_SERVICE);
+ infoFactory.addReference("Repositories", Repository.class, "Repository");
infoFactory.addReference("EJBConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
infoFactory.addReference("EJBReferenceBuilder", EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
infoFactory.addReference("WebConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
@@ -747,7 +755,7 @@
"nonTransactionalTimerAbstractName",
"corbaGBeanAbstractName",
"serverName",
- "Repository",
+ "Repositories",
"EJBConfigBuilder",
"EJBReferenceBuilder",
"WebConfigBuilder",
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java Fri Mar 24 01:12:03 2006
@@ -16,30 +16,30 @@
*/
package org.apache.geronimo.j2ee.deployment;
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.Naming;
-import org.apache.geronimo.gbean.AbstractName;
-
import java.io.File;
import java.net.URL;
+import java.util.Collection;
import java.util.jar.JarFile;
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.repository.Environment;
+
/**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev:386276 $ $Date$
*/
public interface ModuleBuilder {
Module createModule(File plan, JarFile moduleFile, Naming naming) throws DeploymentException;
Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming) throws DeploymentException;
- void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException;
+ void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException;
void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException;
- void addGBeans(EARContext earContext, Module module, ClassLoader cl, Repository repository) throws DeploymentException;
+ void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException;
String getSchemaNamespace();
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Fri Mar 24 01:12:03 2006
@@ -25,10 +25,9 @@
import org.apache.geronimo.gbean.ReferenceCollectionListener;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -43,7 +42,7 @@
import java.util.jar.JarFile;
/**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev:386276 $ $Date$
*/
public class SwitchingModuleBuilder implements ModuleBuilder {
@@ -116,8 +115,7 @@
try {
while (cursor.hasNextToken()){
if (cursor.isStart()) {
- String namespace = cursor.getName().getNamespaceURI();
- return namespace;
+ return cursor.getName().getNamespaceURI();
}
cursor.toNextToken();
}
@@ -145,10 +143,10 @@
}
}
- public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
+ public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
String namespace = module.getNamespace();
ModuleBuilder builder = getBuilderFromNamespace(namespace);
- builder.installModule(earFile, earContext, module, configurationStore, repository);
+ builder.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);
}
public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
@@ -157,10 +155,10 @@
builder.initContext(earContext, module, cl);
}
- public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Repository repository) throws DeploymentException {
+ public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repositories) throws DeploymentException {
String namespace = module.getNamespace();
ModuleBuilder builder = getBuilderFromNamespace(namespace);
- builder.addGBeans(earContext, module, cl, repository);
+ builder.addGBeans(earContext, module, cl, repositories);
}
public String getSchemaNamespace() {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Fri Mar 24 01:12:03 2006
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Collections;
import java.util.jar.JarFile;
import javax.xml.namespace.QName;
@@ -267,7 +268,7 @@
naming);
Object plan = configBuilder.getDeploymentPlan(null, earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
} finally {
if (configurationData != null) {
DeploymentUtil.recursiveDelete(configurationData.getConfigurationDir());
@@ -296,7 +297,7 @@
ConfigurationData configurationData = null;
try {
Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-ejb-jar.xml"), earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
if (e.getCause() instanceof IOException) {
@@ -330,7 +331,7 @@
ConfigurationData configurationData = null;
try {
Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-war.xml"), earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
if (e.getCause() instanceof IOException) {
@@ -364,7 +365,7 @@
ConfigurationData configurationData = null;
try {
Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-rar.xml"), earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
if (e.getCause() instanceof IOException) {
@@ -398,7 +399,7 @@
ConfigurationData configurationData = null;
try {
Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-car.xml"), earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
if (e.getCause() instanceof IOException) {
@@ -433,7 +434,7 @@
ConfigurationData configurationData = null;
try {
Object plan = configBuilder.getDeploymentPlan(null, earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
// expected
@@ -465,7 +466,7 @@
ConfigurationData configurationData = null;
try {
Object plan = configBuilder.getDeploymentPlan(null, earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
// expected
@@ -497,7 +498,7 @@
ConfigurationData configurationData = null;
try {
Object plan = configBuilder.getDeploymentPlan(null, earFile);
- configurationData = configBuilder.buildConfiguration(plan, earFile, configStore);
+ configurationData = configBuilder.buildConfiguration(plan, earFile, Collections.singleton(configStore), configStore);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
// expected
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=388468&r1=388467&r2=388468&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Fri Mar 24 01:12:03 2006
@@ -21,10 +21,9 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -34,6 +33,7 @@
import java.io.File;
import java.net.URL;
import java.util.jar.JarFile;
+import java.util.Collection;
/**
* @version $Rev:385692 $ $Date$
@@ -54,7 +54,7 @@
return new ConnectorModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
}
- public void installModule(JarFile earFile, EARContext earContext, Module connectorModule, ConfigurationStore configurationStore, Repository repository) {
+ public void installModule(JarFile earFile, EARContext earContext, Module connectorModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
assertNotNull(earFile);
assertNotNull(earContext);
this.earContext = earContext;
@@ -74,7 +74,7 @@
this.cl = cl;
}
- public void addGBeans(EARContext earContext, Module connectorModule, ClassLoader cl, Repository repository) {
+ public void addGBeans(EARContext earContext, Module connectorModule, ClassLoader cl, Collection repository) {
assertEquals(this.earContext, earContext);
// assertEquals(this.connectorModule, connectorModule);
assertEquals(this.cl, cl);