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/04/20 08:47:13 UTC
svn commit: r395511 [2/2] - in /geronimo/branches/1.1:
configs/axis-deployer/ configs/axis-deployer/src/
configs/axis-deployer/src/plan/ configs/axis/ configs/axis/src/
configs/axis/src/plan/ configs/client-deployer/
configs/client-deployer/src/ config...
Added: geronimo/branches/1.1/configs/openejb-deployer/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/LICENSE.txt?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/LICENSE.txt (added)
+++ geronimo/branches/1.1/configs/openejb-deployer/LICENSE.txt Wed Apr 19 23:47:09 2006
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
Added: geronimo/branches/1.1/configs/openejb-deployer/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/NOTICE.txt?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/NOTICE.txt (added)
+++ geronimo/branches/1.1/configs/openejb-deployer/NOTICE.txt Wed Apr 19 23:47:09 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/branches/1.1/configs/openejb-deployer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/maven.xml?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/maven.xml (added)
+++ geronimo/branches/1.1/configs/openejb-deployer/maven.xml Wed Apr 19 23:47:09 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 366676 $ $Date: 2006-01-07 00:37:04 -0500 (Sat, 07 Jan 2006) $ -->
+
+<project default="default">
+
+ <goal name="default">
+ <attainGoal name="car:install"/>
+ </goal>
+</project>
Added: geronimo/branches/1.1/configs/openejb-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/project.properties?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/project.properties (added)
+++ geronimo/branches/1.1/configs/openejb-deployer/project.properties Wed Apr 19 23:47:09 2006
@@ -0,0 +1,28 @@
+##
+##
+## Copyright 2005 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+##
+## $Rev: 367590 $ $Date: 2006-01-10 07:50:02 -0500 (Tue, 10 Jan 2006) $
+##
+
+maven.multiproject.type=car
+
+# just use basic GBean deployer
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
+
+PlanOpenEJBPort=4201
+PlanServerHostname=localhost
Added: geronimo/branches/1.1/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/project.xml?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/project.xml (added)
+++ geronimo/branches/1.1/configs/openejb-deployer/project.xml Wed Apr 19 23:47:09 2006
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+ <id>openejb-deployer</id>
+ <name>openejb Configuration for performing J2EE deployments</name>
+
+ <dependencies>
+ <!-- dependency on deployer -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <version>${geronimo_packaging_plugin_version}</version>
+ <type>plugin</type>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <type>car</type>
+ <artifactId>openejb</artifactId>
+ <version>${pom.currentVersion}</version>
+<!-- replaced import with dependency below to avoid starting j2ee-server during build -->
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <!-- dependencies from gbean-deployer needed as maven adds service builder to the maven.root classloader -->
+ <!-- dependencies from plan -->
+
+ <!-- common libraries used by all builders -->
+
+ <!-- todo builder implementations - can we move these to sub-plans? -->
+ <!-- EAR, application-clients and other J2EE artifacts -->
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>${axis_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j_version}</version>
+ </dependency>
+
+ <!-- WARs using Jetty -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-web-builder</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-jetty-builder</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-jetty</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>${jetty_version}</version>
+ </dependency>
+
+ <!-- EJBs using OpenEJB -->
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-builder</artifactId>
+ <version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-pkgen-builder</artifactId>
+ <version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql</artifactId>
+ <version>${tranql_version}</version>
+ </dependency>
+
+ <!-- RARs using Geronimo Connector implementation -->
+ </dependencies>
+</project>
+
Added: geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml (added)
+++ geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml Wed Apr 19 23:47:09 2006
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+
+ <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
+ <attribute name="listener">?name=WebContainer</attribute>
+ <reference name="WebServiceLinkTemplate">
+ <name>WebServiceEJBLinkTemplate</name>
+ </reference>
+ <reference name="WebServiceBuilder">
+ <name>WebServiceBuilder</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>
+ <version>${pom.currentVersion}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ </gbean>
+
+
+ <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
+ <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
+
+ <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
+ <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
+ <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
+
+</configuration>
Added: geronimo/branches/1.1/configs/openejb/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/LICENSE.txt?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb/LICENSE.txt (added)
+++ geronimo/branches/1.1/configs/openejb/LICENSE.txt Wed Apr 19 23:47:09 2006
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
Added: geronimo/branches/1.1/configs/openejb/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/NOTICE.txt?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb/NOTICE.txt (added)
+++ geronimo/branches/1.1/configs/openejb/NOTICE.txt Wed Apr 19 23:47:09 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/branches/1.1/configs/openejb/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/maven.xml?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb/maven.xml (added)
+++ geronimo/branches/1.1/configs/openejb/maven.xml Wed Apr 19 23:47:09 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 366676 $ $Date: 2006-01-07 00:37:04 -0500 (Sat, 07 Jan 2006) $ -->
+
+<project default="default">
+
+ <goal name="default">
+ <attainGoal name="car:install"/>
+ </goal>
+</project>
Added: geronimo/branches/1.1/configs/openejb/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/project.properties?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb/project.properties (added)
+++ geronimo/branches/1.1/configs/openejb/project.properties Wed Apr 19 23:47:09 2006
@@ -0,0 +1,32 @@
+##
+##
+## Copyright 2005 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+##
+## $Rev: 366676 $ $Date: 2006-01-07 00:37:04 -0500 (Sat, 07 Jan 2006) $
+##
+
+maven.multiproject.type=car
+
+# just use basic GBean deployer
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
+
+PlanHTTPPort=8080
+PlanHTTPSPort=8443
+PlanOpenEJBPort=4201
+PlanServerHostname=localhost
+PlanClientAddresses=127.0.0.1
+PlanRemoteLoginPort=4242
Added: geronimo/branches/1.1/configs/openejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/project.xml?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb/project.xml (added)
+++ geronimo/branches/1.1/configs/openejb/project.xml Wed Apr 19 23:47:09 2006
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 389311 $ $Date: 2006-03-27 17:19:34 -0500 (Mon, 27 Mar 2006) $ -->
+
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+ <id>openejb</id>
+ <name>openejb Configuration for the J2EE Server</name>
+
+ <dependencies>
+ <!-- dependency on deployer -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <version>${geronimo_packaging_plugin_version}</version>
+ <type>plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ </dependency>
+ <!-- parent config -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>axis</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-timer</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <version>${geronimo_spec_j2ee_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-corba-2.3</artifactId>
+ <version>${geronimo_spec_correct_corba_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-activation</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-naming</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-jmxremoting</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-jetty</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql</artifactId>
+ <version>${tranql_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>howl</groupId>
+ <artifactId>howl-logger</artifactId>
+ <version>${howl_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>${regexp_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>${axis_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>${commons_discovery_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>activecluster</groupId>
+ <artifactId>activecluster</artifactId>
+ <version>${wadi_activecluster_version}</version>
+ </dependency>
+ </dependencies>
+</project>
+
Added: geronimo/branches/1.1/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/src/plan/plan.xml?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/openejb/src/plan/plan.xml (added)
+++ geronimo/branches/1.1/configs/openejb/src/plan/plan.xml Wed Apr 19 23:47:09 2006
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 378404 $ $Date: 2006-02-16 19:17:27 -0500 (Thu, 16 Feb 2006) $ -->
+
+<!--
+Configuration for the main ring of a Geronimo server.
+
+This configuration should contain those services normally provided
+by the server.
+ parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
+
+-->
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+ <gbean name="EJBNetworkService" class="org.activeio.xnet.StandardServiceStackGBean">
+ <attribute name="name">EJB</attribute>
+ <attribute name="port">${PlanOpenEJBPort}</attribute>
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="allowHosts">${PlanClientAddresses}</attribute>
+ <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
+ <attribute name="logOnFailure">HOST,NAME</attribute>
+ <reference name="Executor">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="Server">
+ <name>EJBServer</name>
+ </reference>
+ </gbean>
+
+ <gbean name="EJBServer" class="org.openejb.server.ejbd.EjbServerGBean">
+ <reference name="ContainerIndex">
+ <name>ContainerIndex</name>
+ </reference>
+ <reference name="ORBRefs">
+ <name>Server</name>
+ </reference>
+ </gbean>
+
+ <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
+ <gbean name="ContainerIndex" class="org.openejb.ContainerIndex">
+ <references name="EJBContainers">
+ <pattern>
+ <type>StatelessSessionBean</type>
+ </pattern>
+ <pattern>
+ <type>StatefulSessionBean</type>
+ </pattern>
+ <pattern>
+ <type>EntityBean</type>
+ </pattern>
+ </references>
+ </gbean>
+
+ <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+
+</configuration>
Modified: geronimo/branches/1.1/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.properties?rev=395511&r1=395510&r2=395511&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.properties (original)
+++ geronimo/branches/1.1/etc/project.properties Wed Apr 19 23:47:09 2006
@@ -119,6 +119,8 @@
geronimo_spec_saaj_version=1.0
geronimo_spec_servlet_version=1.0
+geronimo_spec_correct_corba_version=rc4
+
ant_version=1.6.5
antlr_version=2.7.2
apacheds_version=0.9.2
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=395511&r1=395510&r2=395511&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 Wed Apr 19 23:47:09 2006
@@ -167,7 +167,7 @@
rarFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear-noger.ear"));
EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, transactionContextManagerName, connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()), null, null, ejbReferenceBuilder, null,
new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching),
- resourceReferenceBuilder, null, serviceReferenceBuilder, kernel);
+ resourceReferenceBuilder, null, serviceReferenceBuilder, kernel.getNaming());
ConfigurationData configData = null;
DeploymentContext context = null;
ArtifactManager artifactManager = new DefaultArtifactManager();
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=395511&r1=395510&r2=395511&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 Wed Apr 19 23:47:09 2006
@@ -52,6 +52,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.ReferencePatterns;
+import org.apache.geronimo.gbean.SingleElementCollection;
import org.apache.geronimo.j2ee.ApplicationInfo;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl;
@@ -91,9 +92,9 @@
private final ModuleBuilder webConfigBuilder;
private final ModuleBuilder connectorConfigBuilder;
private final ModuleBuilder appClientConfigBuilder;
- private final EJBReferenceBuilder ejbReferenceBuilder;
- private final ResourceReferenceBuilder resourceReferenceBuilder;
- private final ServiceReferenceBuilder serviceReferenceBuilder;
+ private final SingleElementCollection ejbReferenceBuilder;
+ private final SingleElementCollection resourceReferenceBuilder;
+ private final SingleElementCollection serviceReferenceBuilder;
private final Environment defaultEnvironment;
private final AbstractNameQuery serverName;
@@ -114,12 +115,12 @@
AbstractNameQuery serverName,
Collection repositories,
ModuleBuilder ejbConfigBuilder,
- EJBReferenceBuilder ejbReferenceBuilder,
+ Collection ejbReferenceBuilder,
ModuleBuilder webConfigBuilder,
ModuleBuilder connectorConfigBuilder,
- ResourceReferenceBuilder resourceReferenceBuilder,
+ Collection resourceReferenceBuilder,
ModuleBuilder appClientConfigBuilder,
- ServiceReferenceBuilder serviceReferenceBuilder,
+ Collection serviceReferenceBuilder,
Kernel kernel) {
this(defaultEnvironment,
transactionContextManagerAbstractName,
@@ -130,15 +131,14 @@
serverName,
repositories,
ejbConfigBuilder,
- ejbReferenceBuilder,
+ new SingleElementCollection(ejbReferenceBuilder),
webConfigBuilder,
connectorConfigBuilder,
- resourceReferenceBuilder,
+ new SingleElementCollection(resourceReferenceBuilder),
appClientConfigBuilder,
- serviceReferenceBuilder,
+ new SingleElementCollection(serviceReferenceBuilder),
kernel.getNaming());
}
-
public EARConfigBuilder(Environment defaultEnvironment,
AbstractNameQuery transactionContextManagerAbstractName,
AbstractNameQuery connectionTrackerAbstractName,
@@ -155,6 +155,40 @@
ModuleBuilder appClientConfigBuilder,
ServiceReferenceBuilder serviceReferenceBuilder,
Naming naming) {
+ this(defaultEnvironment,
+ transactionContextManagerAbstractName,
+ connectionTrackerAbstractName,
+ transactionalTimerAbstractName,
+ nonTransactionalTimerAbstractName,
+ corbaGBeanAbstractName,
+ serverName,
+ repositories,
+ ejbConfigBuilder,
+ new SingleElementCollection(ejbReferenceBuilder),
+ webConfigBuilder,
+ connectorConfigBuilder,
+ new SingleElementCollection(resourceReferenceBuilder),
+ appClientConfigBuilder,
+ new SingleElementCollection(serviceReferenceBuilder),
+ naming);
+ }
+
+ private EARConfigBuilder(Environment defaultEnvironment,
+ AbstractNameQuery transactionContextManagerAbstractName,
+ AbstractNameQuery connectionTrackerAbstractName,
+ AbstractNameQuery transactionalTimerAbstractName,
+ AbstractNameQuery nonTransactionalTimerAbstractName,
+ AbstractNameQuery corbaGBeanAbstractName,
+ AbstractNameQuery serverName,
+ Collection repositories,
+ ModuleBuilder ejbConfigBuilder,
+ SingleElementCollection ejbReferenceBuilder,
+ ModuleBuilder webConfigBuilder,
+ ModuleBuilder connectorConfigBuilder,
+ SingleElementCollection resourceReferenceBuilder,
+ ModuleBuilder appClientConfigBuilder,
+ SingleElementCollection serviceReferenceBuilder,
+ Naming naming) {
this.repositories = repositories;
this.defaultEnvironment = defaultEnvironment;
@@ -174,6 +208,18 @@
this.naming = naming;
}
+ private EJBReferenceBuilder getEjbReferenceBuilder() {
+ return (EJBReferenceBuilder) ejbReferenceBuilder.getElement();
+ }
+
+ private ResourceReferenceBuilder getResourceReferenceBuilder() {
+ return (ResourceReferenceBuilder) resourceReferenceBuilder.getElement();
+ }
+
+ private ServiceReferenceBuilder getServiceReferenceBuilder() {
+ return (ServiceReferenceBuilder) serviceReferenceBuilder.getElement();
+ }
+
public Object getDeploymentPlan(File planFile, JarFile jarFile) throws DeploymentException {
if (planFile == null && jarFile == null) {
return null;
@@ -367,7 +413,7 @@
transactionalTimerObjectName,
nonTransactionalTimerObjectName,
corbaGBeanObjectName,
- new RefContext(ejbReferenceBuilder, resourceReferenceBuilder, serviceReferenceBuilder));
+ new RefContext(getEjbReferenceBuilder(), getResourceReferenceBuilder(), getServiceReferenceBuilder()));
// Copy over all files that are _NOT_ modules
Set moduleLocations = applicationInfo.getModuleLocations();
@@ -399,7 +445,7 @@
}
earContext.flush();
-
+
// give each module a chance to populate the earContext now that a classloader is available
ClassLoader cl = earContext.getClassLoader();
for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
Added: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java?rev=395511&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java (added)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java Wed Apr 19 23:47:09 2006
@@ -0,0 +1,58 @@
+/**
+ *
+ * Copyright 2003-2004 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.gbean;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+
+/**
+ * A wrapper around a reference collection to simulate a 0..1 reference
+ */
+public class SingleElementCollection {
+
+ private final Collection collection;
+
+ public SingleElementCollection(Object element) {
+ if (element == null) {
+ collection = Collections.EMPTY_SET;
+ } else {
+ collection = Collections.singleton(element);
+ }
+ }
+
+ public SingleElementCollection(Collection collection) {
+ if (collection == null) {
+ throw new IllegalArgumentException("No collection parameter supplied");
+ }
+
+ this.collection = collection;
+ }
+
+ public Object getElement() {
+ if (collection.isEmpty()) {
+ return null;
+ }
+ if (collection.size() > 1) {
+ throw new IllegalStateException("More than one element: " + collection);
+ }
+ Iterator it = collection.iterator();
+ return it.next();
+ }
+
+}