geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r128446 - in geronimo/trunk: etc modules/assembly modules/assembly/src/plan modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl modules/kernel/src/java/org/apache/geronimo/kernel/config modules/spring modules/spring-builder modules/spring-builder/src modules/spring-builder/src/java modules/spring-builder/src/java/org modules/spring-builder/src/java/org/apache modules/spring-builder/src/java/org/apache/geronimo modules/spring-builder/src/java/org/apache/geronimo/spring modules/spring-builder/src/java/org/apache/geronimo/spring/deployment
Date Fri, 28 Jan 2005 00:12:38 GMT
Author: jules
Date: Thu Jan 27 16:12:37 2005
New Revision: 128446

URL: http://svn.apache.org/viewcvs?view=rev&rev=128446
Log:
First cut of a SprinDeployer - deploys .spr files (jars containing a META-INF/spring.xml and classes).
Use the org/apache/geronimo/SpringDeployer config.
Lots more work to do.

Added:
   geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/SpringApplicationImpl.java
   geronimo/trunk/modules/spring-builder/
   geronimo/trunk/modules/spring-builder/LICENSE.txt
   geronimo/trunk/modules/spring-builder/NOTICE.txt
   geronimo/trunk/modules/spring-builder/maven.xml
   geronimo/trunk/modules/spring-builder/project.properties
   geronimo/trunk/modules/spring-builder/project.xml
   geronimo/trunk/modules/spring-builder/src/
   geronimo/trunk/modules/spring-builder/src/java/
   geronimo/trunk/modules/spring-builder/src/java/org/
   geronimo/trunk/modules/spring-builder/src/java/org/apache/
   geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/
   geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/
   geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/
   geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
   geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfiguration.java
   geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigurer.java
   geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRContext.java
Modified:
   geronimo/trunk/etc/project.properties
   geronimo/trunk/modules/assembly/maven.xml
   geronimo/trunk/modules/assembly/project.xml
   geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
   geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java
   geronimo/trunk/modules/spring/project.xml

Modified: geronimo/trunk/etc/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?view=diff&rev=128446&p1=geronimo/trunk/etc/project.properties&r1=128445&p2=geronimo/trunk/etc/project.properties&r2=128446
==============================================================================
--- geronimo/trunk/etc/project.properties	(original)
+++ geronimo/trunk/etc/project.properties	Thu Jan 27 16:12:37 2005
@@ -148,7 +148,8 @@
 oro_version=2.0.8
 p2psockets_version=1.1.2
 regexp_version=1.3
-spring_version=1.0.1
+spring_artifact=spring
+spring_version=1.1.3
 stax_version=1.1.1-dev
 stax_api_version=1.0
 tomcat_version=5.5.4

Modified: geronimo/trunk/modules/assembly/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?view=diff&rev=128446&p1=geronimo/trunk/modules/assembly/maven.xml&r1=128445&p2=geronimo/trunk/modules/assembly/maven.xml&r2=128446
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml	(original)
+++ geronimo/trunk/modules/assembly/maven.xml	Thu Jan 27 16:12:37 2005
@@ -264,6 +264,14 @@
             <ant:arg value="target/plan/j2ee-runtime-deployer-plan.xml"/>
         </ant:java>
 
+        <!-- build the spring deployer configuration -->
+        <ant:echo>Building spring deployer configuration</ant:echo>
+        <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+            <ant:jvmarg value="-ea"/>
+            <ant:arg value="distribute"/>
+            <ant:arg value="target/plan/spring-deployer-plan.xml"/>
+        </ant:java>
+
         <!-- build the system configuration and client.jar -->
         <ant:echo>Building client.jar</ant:echo>
         <ant:mkdir dir="${distDir}/bin"/>

Modified: geronimo/trunk/modules/assembly/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&rev=128446&p1=geronimo/trunk/modules/assembly/project.xml&r1=128445&p2=geronimo/trunk/modules/assembly/project.xml&r2=128446
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml	(original)
+++ geronimo/trunk/modules/assembly/project.xml	Thu Jan 27 16:12:37 2005
@@ -1084,6 +1084,25 @@
         </dependency>
         <!-- end corba support-->
 
+        <!-- spring support-->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-spring-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>${spring_artifact}</artifactId>
+            <version>${spring_version}</version>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+        <!-- end spring support-->
+
     </dependencies>
 
 </project>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?view=diff&rev=128446&p1=geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml&r1=128445&p2=geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml&r2=128446
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml	Thu Jan 27 16:12:37 2005
@@ -64,6 +64,13 @@
          <uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
     </dependency>
 
+    <!-- should be in spring-deployer-plan.xml but...  -->
+    <dependency>
+        <uri>springframework/jars/${spring_artifact}-${spring_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-spring-builder-${geronimo_version}.jar</uri>
+    </dependency>
 
     <!-- deployer gbeans -->
     <gbean namePart="Deployer" class="org.apache.geronimo.deployment.Deployer">
@@ -169,4 +176,11 @@
 <!--    </gbean>-->
 <!---->
     <!-- end deployment block -->
+
+    <!-- should be in spring-deployer-plan.xml but...  -->
+    <gbean namePart="SPRBuilder" class="org.apache.geronimo.spring.deployment.SPRConfigBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/RuntimeDeployer</attribute>
+        <reference name="Repository">*:name=Repository,*</reference>
+    </gbean>
+
 </configuration>

Added: geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,46 @@
+<?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.
+-->
+
+<!-- $Rev: 126313 $ $Date: 2005-01-24 21:03:52 +0000 (Mon, 24 Jan 2005) $ -->
+
+<!--
+Child of the org/apache/geronimo/RuntimeDeployer configuration that adds the Spring deployer
+-->
+<configuration
+    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    configId="org/apache/geronimo/SpringDeployer"
+    parentId="org/apache/geronimo/RuntimeDeployer"
+    >
+
+    <!-- moved into j2ee-runtime-deployer-plan.xml because it doesn't work here -->
+
+<!--
+    <dependency>
+        <uri>springframework/jars/${spring_artifact}-${spring_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-spring-builder-${geronimo_version}.jar</uri>
+    </dependency>
+
+    <gbean namePart="SPRBuilder" class="org.apache.geronimo.spring.deployment.SPRConfigBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/RuntimeDeployer</attribute>
+        <reference name="Repository">*:name=Repository,*</reference>
+    </gbean>
+-->
+
+</configuration>

Added: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/SpringApplicationImpl.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/SpringApplicationImpl.java?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/SpringApplicationImpl.java	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,59 @@
+/**
+ *
+ * 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.j2ee.management.impl;
+
+import java.util.Hashtable;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+// I know that this should not be here (in the j2ee package) but,
+// until someone who knows what they are doing has time to have a look
+// at it, this seems the path of least resistance...
+
+/**
+ * @version $Rev: 126313 $ $Date: 2005-01-24 21:03:52 +0000 (Mon, 24 Jan 2005) $
+ */
+public class SpringApplicationImpl {
+
+    public SpringApplicationImpl() {
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SpringApplicationImpl.class, "SpringApplication");
+
+	//        infoFactory.addAttribute("kernel", Kernel.class, false);
+	//        infoFactory.addAttribute("objectName", String.class, false);
+
+        infoFactory.setConstructor(new String[]{});
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java?view=diff&rev=128446&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java&r1=128445&p2=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java&r2=128446
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java	(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationModuleType.java	Thu Jan 27 16:12:37 2005
@@ -39,7 +39,9 @@
 
     public static final ConfigurationModuleType APP_CLIENT = new ConfigurationModuleType("APP_CLIENT", 6);
 
-    private static final ConfigurationModuleType[] fromInt = {EAR, EJB, CAR, RAR, WAR, SERVICE, APP_CLIENT};
+    public static final ConfigurationModuleType SPR = new ConfigurationModuleType("SPR", 7);
+
+    private static final ConfigurationModuleType[] fromInt = {EAR, EJB, CAR, RAR, WAR, SERVICE, APP_CLIENT, SPR};
 
     private final String name;
     

Added: geronimo/trunk/modules/spring-builder/LICENSE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/LICENSE.txt?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/LICENSE.txt	Thu Jan 27 16:12:37 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.
+

Added: geronimo/trunk/modules/spring-builder/NOTICE.txt
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/NOTICE.txt?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/NOTICE.txt	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/trunk/modules/spring-builder/maven.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/maven.xml?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/maven.xml	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,39 @@
+<?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: 56771 $ $Date: 2004-11-06 19:58:54 +0000 (Sat, 06 Nov 2004) $ -->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven"
+    xmlns:xmlbeans="geronimo:xmlbeans">
+
+<!--
+    <preGoal name="java:compile">
+        <xmlbeans:schema2java
+            sourcedir="${basedir}/src"
+            sourceschema="schema/geronimo-spring.xsd"
+            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
+            targetdir="${basedir}/target/xmlbeans"
+            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+    </preGoal>
+-->
+
+</project>

Added: geronimo/trunk/modules/spring-builder/project.properties
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/project.properties?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/project.properties	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,15 @@
+##
+## $Rev: 56771 $ $Date: 2004-11-06 19:58:54 +0000 (Sat, 06 Nov 2004) $
+##
+
+# the directory containing the geronimo website in CVS
+
+maven.repo.remote=http://www.apache.org/~jboynes, http://www.mortbay.org/maven, http://www.openejb.org/maven, http://dist.codehaus.org, http://www.ibiblio.org/maven, http://www.apache.org/dist/java-repository/
+
+maven.junit.jvmargs=-Djava.security.auth.login.config=src/test-resources/data/login.config
+maven.junit.fork=true
+
+# Include the generated xmlbean classes in the eclipse classpath
+maven.eclipse.classpath.include=target/xmlbeans
+
+maven.idea.generated.source=xmlbeans

Added: geronimo/trunk/modules/spring-builder/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/project.xml?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/project.xml	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,338 @@
+<?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: 123366 $ $Date: 2004-12-26 20:20:14 +0000 (Sun, 26 Dec 2004) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>Geronimo :: Spring :: Builder</name>
+    <id>geronimo-spring-builder</id>
+    <shortDescription>Spring Deployer</shortDescription>
+    <description>Geronimo Spring Deployer</description>
+    <url>http://geronimo.apache.org/modules/spring-builder/</url>
+    <siteDirectory>/www/geronimo.apache.org/modules/spring-builder</siteDirectory>
+    <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/spring-builder</distributionDirectory>
+
+    <package>org.apache.geronimo.spring</package>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-xmlbeans-plugin</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>plugin</type>
+        </dependency>
+
+        <!-- needed for xmlbeans runtime-->
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean-apache</artifactId>
+            <version>${xmlbeans_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+    <!-- todo: remove this once the DConfigBean home is selected -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
+        </dependency>
+
+<!--
+       <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-spring</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+-->
+
+       <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jta</artifactId>
+            <version>${geronimo_spec_jta_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+            <version>${geronimo_spec_j2ee_jacc_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee-connector</artifactId>
+            <version>${geronimo_spec_j2ee_connector_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+            <version>${geronimo_spec_j2ee_deployment_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>${spring_artifact}</artifactId>
+            <version>${spring_version}</version>
+            <url>http://www.springframework.org</url>
+        </dependency>
+<!--
+        <dependency>
+            <groupId>springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>1.1.3</version>
+            <url>http://www.springframework.org</url>
+        </dependency>
+-->
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <version>${mx4j_version}</version>
+        </dependency>
+
+        <!-- these are just needed to run the unit tests -->
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-servlet</artifactId>
+            <version>${geronimo_spec_servlet_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jsp</artifactId>
+            <version>${geronimo_spec_jsp_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
+            <url>http://jakarta.apache.org/commons/logging/</url>
+        </dependency>
+
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-compiler</artifactId>
+            <version>${tomcat_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>jasper-runtime</artifactId>
+            <version>${tomcat_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-el</groupId>
+            <artifactId>commons-el</artifactId>
+            <version>${commons_el_version}</version>
+            <url>http://jakarta.apache.org/commons/el/</url>
+        </dependency>
+
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>${ant_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-full</artifactId>
+            <version>${cglib_version}</version>
+            <url>http://cglib.sf.net/</url>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${concurrent_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+            <version>${regexp_version}</version>
+            <url>http://jakarta.apache.org/regexp</url>
+        </dependency>
+
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+            <version>${tranql_version}</version>
+            <url>http://tranql.codehaus.org</url>
+        </dependency>
+    </dependencies>
+
+
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/etc</directory>
+            </resource>
+            <resource>
+                <directory>${basedir}/target/xmlbeans</directory>
+                <includes>schema/**</includes>
+            </resource>
+        </resources>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/Abstract*.java</exclude>
+            </excludes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/schema</directory>
+                    <includes>
+                        <include>*.xsd</include>
+                    </includes>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/test-resources</directory>
+                </resource>
+            </resources>
+        </unitTest>
+    </build>
+</project>

Added: geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,165 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.geronimo.spring.deployment;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.ConfigurationBuilder;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.util.NestedJarFile; // could this be useful ?
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.repository.Repository;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * @version $Rev: 126313 $ $Date: 2005-01-24 21:03:52 +0000 (Mon, 24 Jan 2005) $
+ */
+public class SPRConfigBuilder
+  implements ConfigurationBuilder
+{
+  private final Kernel     kernel;
+  private final Repository repository;
+  private final URI        defaultParentId;
+
+  public
+    SPRConfigBuilder(URI defaultParentId, Repository repository, Kernel kernel)
+  {
+    this.kernel         =kernel;
+    this.repository     =repository;
+    this.defaultParentId=defaultParentId;
+  }
+
+  //----------------------------------------
+  // RTTI
+
+  public static final GBeanInfo GBEAN_INFO;
+
+  static
+  {
+    GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SPRConfigBuilder.class, NameFactory.CONFIG_BUILDER);
+    infoFactory.addAttribute("defaultParentId", URI.class, true);
+    infoFactory.addReference("Repository", Repository.class);
+    infoFactory.addAttribute("kernel", Kernel.class, false);
+    infoFactory.addInterface(ConfigurationBuilder.class);
+    infoFactory.setConstructor(new String[]{"defaultParentId", "Repository", "kernel"});
+
+    GBEAN_INFO = infoFactory.getBeanInfo();
+  }
+
+  public static GBeanInfo getGBeanInfo() {return GBEAN_INFO;}
+
+  //----------------------------------------
+
+  public Object
+    getDeploymentPlan(File planFile, JarFile sprFile)
+    throws DeploymentException
+  {
+    if (sprFile==null || !sprFile.getName().endsWith(".spr")) return null;
+
+    System.out.println("PLANNING: "+sprFile.getName());
+
+    // N.B.
+    // - we should check out META-INF/geronimo-spring.xml
+    // - we can't validate META-INF/spring.xml, as it could include stuff and use bad classes etc..
+    // - could we inject stuff about environment into BeanFactory ?
+
+    DefaultListableBeanFactory dlbf=new DefaultListableBeanFactory();
+    XmlBeanDefinitionReader xbdr=new XmlBeanDefinitionReader(dlbf);
+
+    // we should check that META-INF/spring.xml exists here (we can't really validate it)
+    // we could load and check META-INF/geronimo-spring.xml here
+
+    return xbdr;
+  }
+
+  public List
+    buildConfiguration(Object plan, JarFile sprFile, File outfile)
+    throws IOException, DeploymentException
+  {
+    if (!(plan instanceof XmlBeanDefinitionReader))
+      return null;
+
+    XmlBeanDefinitionReader xbdr=(XmlBeanDefinitionReader)plan;
+
+    System.out.println("BUILDING: "+sprFile.getName());
+
+    try
+    {
+      URI configId=new URI(sprFile.getName());	// could be overridden in META-INF/geronimo-spring.xml
+      URI parentId=defaultParentId; // could be overridden in META-INF/geronimo-spring.xml
+
+      SPRContext ctx=new SPRContext(outfile,
+				    configId,
+				    ConfigurationModuleType.SPR,
+				    parentId,
+				    kernel);
+
+      // not sure of the purpose behind this - nested jars ?
+      for (Enumeration e=sprFile.entries(); e.hasMoreElements();)
+      {
+	ZipEntry entry = (ZipEntry) e.nextElement();
+	ctx.addFile(URI.create(entry.getName()), sprFile, entry);
+      }
+
+      // set up classpath
+      ctx.addIncludeAsPackedJar(new URI("/tmp/foo.spr"), sprFile); // what should we pass for targetPath ?
+      // now we can get ClassLoader...
+      ClassLoader cl=ctx.getClassLoader(repository);
+
+      xbdr.setBeanClassLoader(cl);
+      xbdr.loadBeanDefinitions(new ClassPathResource("META-INF/spring.xml", cl));
+
+      ObjectName name=new ObjectName("geronimo.config", "name", sprFile.getName());
+      GBeanData gbeanData = new GBeanData(name, org.apache.geronimo.j2ee.management.impl.SpringApplicationImpl.GBEAN_INFO);
+
+      // setting 'kernel' results in a NotSerializableException: after
+      // returning from this method...
+
+      // gbeanData.setAttribute("kernel", kernel);
+      // gbeanData.setReferencePattern("objectName", name);
+
+      ctx.addGBean(gbeanData);
+      ctx.close();
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+      throw new DeploymentException(e);
+    }
+
+    return new LinkedList(); // what should we return in this list ?
+  }
+}

Added: geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfiguration.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfiguration.java?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfiguration.java	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,34 @@
+/**
+ *
+ * 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.spring.deployment;
+
+import javax.enterprise.deploy.model.DeployableObject;
+
+import org.apache.geronimo.deployment.plugin.DeploymentConfigurationSupport;
+
+/**
+ *
+ *
+ * @version $Rev: 109593 $ $Date: 2004-12-02 23:37:56 +0000 (Thu, 02 Dec 2004) $
+ */
+public class SPRConfiguration extends DeploymentConfigurationSupport{
+    public SPRConfiguration(DeployableObject deployable) {
+        super(deployable, null);
+	new Exception().printStackTrace();
+    }
+}

Added: geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigurer.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigurer.java?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigurer.java	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,57 @@
+/**
+ *
+ * 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.spring.deployment;
+
+import javax.enterprise.deploy.model.DeployableObject;
+import javax.enterprise.deploy.spi.DeploymentConfiguration;
+
+import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+/**
+ *
+ *
+ * @version $Rev: 126313 $ $Date: 2005-01-24 21:03:52 +0000 (Mon, 24 Jan 2005) $
+ */
+public class SPRConfigurer
+  implements ModuleConfigurer
+{
+  //----------------------------------------
+  // RTTI
+
+  public static final GBeanInfo GBEAN_INFO;
+
+  static
+  {
+    GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SPRConfigurer.class, NameFactory.DEPLOYMENT_CONFIGURER);
+    infoFactory.addInterface(ModuleConfigurer.class);
+    GBEAN_INFO = infoFactory.getBeanInfo();
+  }
+
+  public static GBeanInfo getGBeanInfo() {return GBEAN_INFO;}
+
+  //----------------------------------------
+
+  public DeploymentConfiguration
+    createConfiguration(DeployableObject deployable)
+  {
+    return new SPRConfiguration(deployable);
+  }
+}

Added: geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRContext.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRContext.java?view=auto&rev=128446
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRContext.java	Thu Jan 27 16:12:37 2005
@@ -0,0 +1,40 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.geronimo.spring.deployment;
+
+import java.io.File;
+import java.net.URI;
+import javax.management.MalformedObjectNameException;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+
+/**
+ * @version $Rev: 125989 $ $Date: 2005-01-22 00:26:15 +0000 (Sat, 22 Jan 2005) $
+ */
+public class SPRContext
+  extends DeploymentContext
+{
+  public
+    SPRContext(File baseDir, URI id, ConfigurationModuleType moduleType, URI parentID, Kernel kernel)
+    throws MalformedObjectNameException, DeploymentException
+  {
+    super(baseDir, id, moduleType, parentID, kernel);
+  }
+}

Modified: geronimo/trunk/modules/spring/project.xml
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring/project.xml?view=diff&rev=128446&p1=geronimo/trunk/modules/spring/project.xml&r1=128445&p2=geronimo/trunk/modules/spring/project.xml&r2=128446
==============================================================================
--- geronimo/trunk/modules/spring/project.xml	(original)
+++ geronimo/trunk/modules/spring/project.xml	Thu Jan 27 16:12:37 2005
@@ -77,7 +77,7 @@
 
       <dependency>
         <id>springframework</id>
-        <artifactId>spring-full</artifactId>
+        <artifactId>${spring_artifact}</artifactId>
         <version>${spring_version}</version>
         <url>http://www.springframework.org</url>
       </dependency>

Mime
View raw message