geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r159776 [2/2] - in geronimo/trunk: assemblies/ assemblies/j2ee-server/ assemblies/j2ee-server/src/ assemblies/j2ee-server/src/var/ assemblies/j2ee-server/src/var/config/ assemblies/j2ee-server/src/var/log/ assemblies/j2ee-server/src/var/security/ configs/geronimo-gbean-deployer/ configs/geronimo-gbean-deployer/src/plan/ configs/j2ee-server/ configs/j2ee-server/src/ configs/j2ee-server/src/plan/ configs/j2ee-system/ configs/j2ee-system/src/ configs/j2ee-system/src/plan/ plugins/geronimo-assembly-plugin/ plugins/geronimo-assembly-plugin/src/ plugins/geronimo-assembly-plugin/src/java/ plugins/geronimo-assembly-plugin/src/java/org/ plugins/geronimo-assembly-plugin/src/java/org/apache/ plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/ plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/ plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ plugins/geronimo-packaging-plugin/ plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/
Date Sat, 02 Apr 2005 17:12:29 GMT
Added: geronimo/trunk/configs/j2ee-system/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/LICENSE.txt?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/configs/j2ee-system/LICENSE.txt (added)
+++ geronimo/trunk/configs/j2ee-system/LICENSE.txt Sat Apr  2 09:12:22 2005
@@ -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.
+

Propchange: geronimo/trunk/configs/j2ee-system/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/configs/j2ee-system/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/NOTICE.txt?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/configs/j2ee-system/NOTICE.txt (added)
+++ geronimo/trunk/configs/j2ee-system/NOTICE.txt Sat Apr  2 09:12:22 2005
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/trunk/configs/j2ee-system/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/configs/j2ee-system/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/maven.xml?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/configs/j2ee-system/maven.xml (added)
+++ geronimo/trunk/configs/j2ee-system/maven.xml Sat Apr  2 09:12:22 2005
@@ -0,0 +1,22 @@
+<?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: 155756 $ $Date: 2005-02-28 22:10:07 -0800 (Mon, 28 Feb 2005) $ -->
+
+<project default="geronimo:package">
+</project>
\ No newline at end of file

Propchange: geronimo/trunk/configs/j2ee-system/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/j2ee-system/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/configs/j2ee-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/project.properties?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.properties (added)
+++ geronimo/trunk/configs/j2ee-system/project.properties Sat Apr  2 09:12:22 2005
@@ -0,0 +1,40 @@
+##
+##
+##   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: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+##
+
+# just use basic GBean deployer
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-0.1.car
+
+geronimo.packaging.classPath= \
+    ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-kernel-${geronimo_version}.jar \
+    ../lib/geronimo-system-${geronimo_version}.jar \
+    ../lib/cglib-full-${cglib_version}.jar \
+    ../lib/commons-cli-${commons_cli_version}.jar \
+    ../lib/commons-logging-${commons_logging_version}.jar \
+    ../lib/log4j-${log4j_version}.jar \
+    ../lib/mx4j-${mx4j_version}.jar \
+    ../lib/mx4j-remote-${mx4j_version}.jar \
+    ../lib/endorsed/xercesImpl-${xerces_version}.jar \
+    ../lib/endorsed/xmlParserAPIs-${xml_parser_apis_version}.jar \
+    ../lib/xbean-apache-${xmlbeans_version}.jar
+
+geronimo.packaging.mainClass=org.apache.geronimo.system.main.Daemon
+geronimo.packaging.endorsedDirs=lib/endorsed
\ No newline at end of file

Propchange: geronimo/trunk/configs/j2ee-system/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/j2ee-system/project.properties
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/configs/j2ee-system/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/project.xml?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.xml (added)
+++ geronimo/trunk/configs/j2ee-system/project.xml Sat Apr  2 09:12:22 2005
@@ -0,0 +1,71 @@
+<?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: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
+
+<project>
+    <extend>../../etc/project.xml</extend>
+    <pomVersion>3</pomVersion>
+    <id>j2ee-system</id>
+    <name>System Configuration for the J2EE Server</name>
+
+    <dependencies>
+        <!-- dependencies referenced in classPath -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</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-service-builder</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean-apache</artifactId>
+            <version>1.0-DEV</version>
+        </dependency>
+
+        <!-- dependency on packaging plugin to force download -->
+<!--
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-packaging-plugin</artifactId>
+            <type>plugin</type>
+            <version>SNAPSHOT</version>
+        </dependency>
+-->
+    </dependencies>
+</project>
+

Propchange: geronimo/trunk/configs/j2ee-system/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/j2ee-system/project.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/src/plan/plan.xml?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/configs/j2ee-system/src/plan/plan.xml (added)
+++ geronimo/trunk/configs/j2ee-system/src/plan/plan.xml Sat Apr  2 09:12:22 2005
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+
+<!--
+Configuration for the innermost ring of a Geronimo server.
+This configuration should only contain critical services needed to
+run other Configurations - for example, the ServerInfo, Logging
+and Repository services used to load them.
+
+This configuration should *NOT* be used to provide server or application
+specific services - those should be provided by children.
+-->
+
+<!-- $Rev$ $Date$ -->
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+    domain="geronimo.server"
+    server="geronimo"
+    >
+
+    <!-- ServerInfo service -->
+    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+
+    <!-- URLFactory service -->
+    <gbean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
+
+    <!-- Configuration Store service -->
+    <gbean name="Local" class="org.apache.geronimo.system.configuration.LocalConfigStore">
+        <attribute name="root">config-store</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
+    <!-- Persistent List of running Configurations service -->
+    <gbean name="Default" class="org.apache.geronimo.system.configuration.FileConfigurationList">
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <attribute name="configFile">var/config/config.list</attribute>
+    </gbean>
+
+    <!-- Repository -->
+    <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+        <attribute name="root">repository/</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
+    <!-- Logging service -->
+    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
+        <attribute name="configurationFile">var/log/server-log4j.properties</attribute>
+        <attribute name="refreshPeriod">60</attribute>
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+    </gbean>
+
+    <!-- RMI Registry -->
+    <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
+        <attribute name="port">1099</attribute>
+    </gbean>
+
+    <!-- Naming properties -->
+    <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
+        <attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
+        <attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
+        <attribute name="namingProviderUrl">rmi://localhost:1099</attribute>
+    </gbean>
+</configuration>
\ No newline at end of file

Propchange: geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr  2 09:12:22 2005
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/LICENSE.txt?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/LICENSE.txt (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/LICENSE.txt Sat Apr  2 09:12:22 2005
@@ -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.
+

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/NOTICE.txt?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/NOTICE.txt (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/NOTICE.txt Sat Apr  2 09:12:22 2005
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml Sat Apr  2 09:12:22 2005
@@ -0,0 +1,24 @@
+<?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: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
+
+<project default="plugin:install">
+    <goal name="default" prereqs="plugin:install"/>
+</project>

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Sat Apr  2 09:12:22 2005
@@ -0,0 +1,110 @@
+<?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: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
+
+<project
+    xmlns:j="jelly:core"
+    xmlns:artifact="artifact"
+    xmlns:ant="jelly:ant"
+    xmlns:define="jelly:define"
+    xmlns:assemble="geronimo:assembly"
+    >
+
+    <define:taglib uri="geronimo:assembly">
+        <define:jellybean name="installConfig" className="org.apache.geronimo.plugin.assembly.LocalConfigInstaller" method="execute"/>
+    </define:taglib>
+
+    <goal name="geronimo:assemble-prepare">
+        <ant:mkdir dir="${geronimo.assembly.dest}"/>
+        <ant:copy todir="${geronimo.assembly.dest}">
+            <ant:fileset dir="${geronimo.assembly.src}"/>
+        </ant:copy>
+    </goal>
+
+    <goal name="geronimo:assemble-lib">
+        <ant:mkdir dir="${geronimo.assembly.dest}/lib"/>
+        <ant:copy todir="${geronimo.assembly.dest}/lib" flatten="true">
+            <ant:fileset dir="${maven.repo.local}">
+                <j:forEach var="artifact" items="${pom.artifacts}">
+                    <j:set var="dependency" value="${artifact.dependency}"/>
+                    <j:if test="${dependency.getProperty('geronimo.assemble') == 'library'}">
+                        <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
+                    </j:if>
+                </j:forEach>
+            </ant:fileset>
+        </ant:copy>
+    </goal>
+
+    <goal name="geronimo:assemble-repository">
+        <ant:mkdir dir="${geronimo.assembly.dest}/repository"/>
+        <ant:copy todir="${geronimo.assembly.dest}/repository">
+            <ant:fileset dir="${maven.repo.local}">
+                <j:forEach var="artifact" items="${pom.artifacts}">
+                    <j:set var="dependency" value="${artifact.dependency}"/>
+                    <j:if test="${dependency.getProperty('geronimo.assemble') == 'repository' || dependency.getProperty('geronimo.assemble') == 'install' || dependency.getProperty('geronimo.assemble') == 'library'}">
+                        <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
+                    </j:if>
+                </j:forEach>
+            </ant:fileset>
+        </ant:copy>
+    </goal>
+
+    <!-- todo automatically add dependencies from configurations into the repo -->
+    <!-- todo automatically add libraries listed in an executable's MCP in the right place, relative to it -->
+    <goal name="geronimo:assemble-configurations">
+        <j:set var="configStore" value="${geronimo.assembly.dest}/config-store"/>
+        <ant:delete dir="${configStore}"/>
+        <ant:mkdir dir="${configStore}"/>
+        <j:forEach var="artifact" items="${pom.artifacts}">
+            <j:set var="dependency" value="${artifact.dependency}"/>
+            <j:if test="${dependency.type == 'car'}">
+                <j:if test="${dependency.getProperty('geronimo.assemble') == 'install'}">
+                    <assemble:installConfig root="${configStore}" artifact="${artifact.file}"/>
+                </j:if>
+
+                <!-- handle executable configs -->
+                <j:if test="${dependency.getProperty('geronimo.assemble.executable') != null}">
+                    <j:set var="exe" value="${geronimo.assembly.dest}/${dependency.getProperty('geronimo.assemble.executable')}"/>
+                    <ant:copy tofile="${exe}" file="${artifact.file}"/>
+                    <ant:chmod file="${exe}" perm="ugo+rx"/>
+                </j:if>
+            </j:if>
+        </j:forEach>
+    </goal>
+
+    <goal name="geronimo:assemble" prereqs="geronimo:assemble-prepare" description="Assemble a Geronimo installation">
+        <attainGoal name="geronimo:assemble-repository"/>
+        <attainGoal name="geronimo:assemble-lib"/>
+        <attainGoal name="geronimo:assemble-configurations"/>
+    </goal>
+
+    <goal name="geronimo:jar-assembly" prereqs="geronimo:assemble">
+        <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar" basedir="${geronimo.assembly.dest}"/>
+    </goal>
+
+    <goal name="geronimo:install-assembly" prereqs="geronimo:jar-assembly" description="Install an assembled Geronimo installation into the local repository">
+        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" project="${pom}"/>
+    </goal>
+
+    <!--
+        <goal name="geronimo:deploy-assembly" prereqs="geronimo:assemble" description="Deploy an assembled Geronimo installation into the remote repository">
+            <artifact:deploy artifact="${maven.build.dir}/${maven.final.name}.jar" project="${pom}"/>
+        </goal>
+    -->
+</project>

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties Sat Apr  2 09:12:22 2005
@@ -0,0 +1,23 @@
+##
+##
+##   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: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+##
+
+geronimo.assembly.dest=${maven.build.dir}/assembly
+geronimo.assembly.src=${basedir}/src

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.properties
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties Sat Apr  2 09:12:22 2005
@@ -0,0 +1,25 @@
+##
+##
+##   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: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+##
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+
+geronimoVersion=1.0-SNAPSHOT
\ No newline at end of file

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Sat Apr  2 09:12:22 2005
@@ -0,0 +1,57 @@
+<?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: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
+<project>
+    <pomVersion>3</pomVersion>
+    <groupId>geronimo</groupId>
+    <id>geronimo-assembly-plugin</id>
+    <name>Geronimo Assembly Plugin</name>
+    <description>A plugin used to assemble a distribution of Geronimo</description>
+    <currentVersion>SNAPSHOT</currentVersion>
+
+    <dependencies>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+
+        <resources>
+            <resource>
+                <directory></directory>
+                <includes>
+                    <include>plugin.jelly</include>
+                    <include>plugin.properties</include>
+                    <include>project.xml</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+</project>
+

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java?view=auto&rev=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java (added)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java Sat Apr  2 09:12:22 2005
@@ -0,0 +1,60 @@
+/**
+ *
+ * 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.plugin.assembly;
+
+import java.io.File;
+import java.net.URI;
+
+import org.apache.geronimo.system.configuration.LocalConfigStore;
+
+/**
+ * JellyBean that installs configuration artifacts into a LocalConfigurationStore
+ *
+ * @version $Rev: 156292 $ $Date: 2005-03-05 18:48:02 -0800 (Sat, 05 Mar 2005) $
+ */
+public class LocalConfigInstaller {
+    private File root;
+    private File artifact;
+
+    public File getRoot() {
+        return root;
+    }
+
+    public void setRoot(File root) {
+        this.root = root;
+    }
+
+    public File getArtifact() {
+        return artifact;
+    }
+
+    public void setArtifact(File artifact) {
+        this.artifact = artifact;
+    }
+
+    public void execute() throws Exception {
+        LocalConfigStore store = new LocalConfigStore(root);
+        store.doStart();
+        try {
+            URI uri = store.install(artifact.toURL());
+            System.out.println("Installed configuration " + uri);
+        } finally{
+            store.doStop();
+        }
+    }
+}

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml?view=diff&r1=159775&r2=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml Sat Apr  2 09:12:22 2005
@@ -22,7 +22,7 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo Packaging Plugin</name>
-    <currentVersion>0.1</currentVersion>
+    <currentVersion>SNAPSHOT</currentVersion>
 
     <dependencies>
         <dependency>
@@ -30,6 +30,8 @@
             <artifactId>geronimo-kernel</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
+        <!-- todo remove these -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -40,6 +42,12 @@
             <artifactId>geronimo-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!-- todo remove the ones above -->
 
         <dependency>
             <groupId>cglib</groupId>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/JMXDistributor.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/JMXDistributor.java?view=diff&r1=159775&r2=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/JMXDistributor.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/JMXDistributor.java Sat Apr  2 09:12:22 2005
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.plugin.packaging;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -27,7 +28,7 @@
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 
-import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.kernel.config.NoSuchStoreException;
 
 /**
  * A Distributor that will distribute packages to a server using JMX remoting.
@@ -39,7 +40,7 @@
 public class JMXDistributor extends AbstractDistributor {
     public void execute() throws Exception {
         if (!getArtifact().canRead()) {
-            throw new DeploymentException("Unable to read artifact " + getArtifact());
+            throw new IOException("Unable to read artifact " + getArtifact());
         }
 
         Map environment = new HashMap();
@@ -62,11 +63,11 @@
         Set set = mbServer.queryNames(storeName, null);
         Iterator i = set.iterator();
         if (!i.hasNext()) {
-            throw new DeploymentException("No ConfigurationStore found matching " + storeName);
+            throw new NoSuchStoreException("No ConfigurationStore found matching " + storeName);
         }
         ObjectName configStore = (ObjectName) i.next();
         if (i.hasNext()) {
-            throw new DeploymentException("Multiple ConfigurationStores found matching " + storeName);
+            throw new NoSuchStoreException("Multiple ConfigurationStores found matching " + storeName);
         }
         return configStore;
     }

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java?view=diff&r1=159775&r2=159776
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Sat Apr  2 09:12:22 2005
@@ -116,7 +116,7 @@
     }
 
     public void updateConfiguration(Configuration configuration) throws NoSuchConfigException, Exception {
-        throw new UnsupportedOperationException();
+        // we don't store persistent state
     }
 
     public List listConfiguations() {



Mime
View raw message