You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/07/11 06:39:41 UTC
svn commit: r420719 [2/2] - in /geronimo/xbean/branches/colossus: ./
maven-xbean-plugin/ xbean-bootstrap/ xbean-bootstrap/src/
xbean-bootstrap/src/main/ xbean-bootstrap/src/main/java/
xbean-bootstrap/src/main/java/org/ xbean-bootstrap/src/main/java/org...
Added: geronimo/xbean/branches/colossus/xbean-bootstrap/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-bootstrap/src/main/resources/META-INF/NOTICE?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-bootstrap/src/main/resources/META-INF/NOTICE (added)
+++ geronimo/xbean/branches/colossus/xbean-bootstrap/src/main/resources/META-INF/NOTICE Mon Jul 10 21:39:36 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/xbean/branches/colossus/xbean-bootstrap/src/test/java/org/apache/xbean/bootstrap/BootstrapTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-bootstrap/src/test/java/org/apache/xbean/bootstrap/BootstrapTest.java?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-bootstrap/src/test/java/org/apache/xbean/bootstrap/BootstrapTest.java (added)
+++ geronimo/xbean/branches/colossus/xbean-bootstrap/src/test/java/org/apache/xbean/bootstrap/BootstrapTest.java Mon Jul 10 21:39:36 2006
@@ -0,0 +1,94 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xbean.bootstrap;
+
+import junit.framework.TestCase;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Properties;
+
+/**
+ * @author Dain Sundstrom
+ * @version $Id$
+ * @since 2.5-colossus
+ */
+public class BootstrapTest extends TestCase {
+ private static final String basedir = System.getProperties().getProperty("basedir", ".");
+
+ private static boolean bootCalled;
+ private static String[] actualArgs;
+ private static Properties actualProperties;
+ private static ClassLoader actualClassLoader;
+
+ private Bootstrap bootstrap;
+
+ public void testSetDirectly() throws Exception{
+ bootstrap.setBootstrapDirectory(basedir);
+ bootstrap.setHomeDirectory("target");
+ bootstrap.initialize(Collections.<String>emptyList());
+ assertBootable(bootstrap);
+ }
+
+ public void testArgs() throws Exception{
+ bootstrap.initialize(Arrays.asList(new String[] {
+ "-D" + Bootstrap.BOOTSTRAP_DIR + "=" + basedir,
+ "-D" + Bootstrap.HOME_DIR + "=target",
+ }));
+ assertBootable(bootstrap);
+ }
+
+ private static void assertBootable(Bootstrap bootstrap) {
+ assertEquals(basedir, bootstrap.getBootstrapDirectory());
+ try {
+ bootstrap.boot();
+ } catch (RuntimeException e) {
+ e.printStackTrace(System.err);
+ throw e;
+ } catch (Error e) {
+ e.printStackTrace(System.err);
+ throw e;
+ }
+
+ assertTrue(bootCalled);
+ assertNotNull(actualArgs);
+ assertNotNull(actualProperties);
+ assertNotNull(actualClassLoader);
+ assertEquals(basedir, actualProperties.getProperty(Bootstrap.BOOTSTRAP_DIR));
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ bootCalled = false;
+ actualArgs = null;
+ actualProperties = null;
+ actualClassLoader = null;
+
+ bootstrap = new Bootstrap();
+ bootstrap.setBootstrapLoader(TestBootstrapLoader.class.getName());
+ }
+
+ public static class TestBootstrapLoader implements BootstrapLoader {
+ public void boot(String[] args, Properties properties, ClassLoader classLoader) {
+ bootCalled = true;
+ actualArgs = args;
+ actualProperties = properties;
+ actualClassLoader = classLoader;
+ }
+ }
+}
Modified: geronimo/xbean/branches/colossus/xbean-classpath/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-classpath/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-classpath/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-classpath/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,10 +2,10 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-classpath</artifactId>
<name>XBean :: ClassPath</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</project>
Propchange: geronimo/xbean/branches/colossus/xbean-colossus/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -0,0 +1,10 @@
+
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Added: geronimo/xbean/branches/colossus/xbean-colossus/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/LICENSE.txt?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/LICENSE.txt (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/LICENSE.txt Mon Jul 10 21:39:36 2006
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Added: geronimo/xbean/branches/colossus/xbean-colossus/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/NOTICE.txt?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/NOTICE.txt (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/NOTICE.txt Mon Jul 10 21:39:36 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: geronimo/xbean/branches/colossus/xbean-colossus/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/pom.xml?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/pom.xml (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/pom.xml Mon Jul 10 21:39:36 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>xbean</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <version>2.5-colossus</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>xbean-colossus</artifactId>
+ <packaging>pom</packaging>
+ <name>XBean :: Colossus</name>
+ <version>2.5-colossus</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ <goal>directory</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/colossus.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>xbean-colossus-${pom.version}</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!--todo I have no idea why this is required but if you remove it maven will not build the modules in the correct order -->
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring-itests-124</artifactId>
+ <version>2.5-colossus</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: geronimo/xbean/branches/colossus/xbean-colossus/src/assemble/colossus.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/src/assemble/colossus.xml?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/src/assemble/colossus.xml (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/src/assemble/colossus.xml Mon Jul 10 21:39:36 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+* Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+*
+* 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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <!--<format>dir</format>-->
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/config</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/*.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/config</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ <excludes>
+ <exclude>org.apache.xbean:xbean-bootstrap</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.xbean:xbean-bootstrap</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added: geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/bootstrap.properties
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/bootstrap.properties?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/bootstrap.properties (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/bootstrap.properties Mon Jul 10 21:39:36 2006
@@ -0,0 +1,15 @@
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+#
+# 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.
+
+xbean.server.spring.configuration.file=conf/server.xml
\ No newline at end of file
Added: geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean-debug.sh
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean-debug.sh?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean-debug.sh (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean-debug.sh Mon Jul 10 21:39:36 2006
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+#
+# 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.
+
+cd "`dirname "$0"`"
+java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -jar xbean-bootstrap-2.5-colossus.jar
\ No newline at end of file
Added: geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean.sh
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean.sh?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean.sh (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean.sh Mon Jul 10 21:39:36 2006
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+#
+# 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.
+
+cd "`dirname "$0"`"
+java -jar xbean-bootstrap-2.5-colossus.jar
Propchange: geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/bin/xbean.sh
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/conf/server.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/conf/server.xml?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/conf/server.xml (added)
+++ geronimo/xbean/branches/colossus/xbean-colossus/src/main/config/conf/server.xml Mon Jul 10 21:39:36 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+* Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+*
+* 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.
+-->
+<beans xmlns:s="http://xbean.apache.org/schemas/server">
+ <bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <s:daemon-main name="main"/>
+</beans>
Modified: geronimo/xbean/branches/colossus/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-finder/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-finder/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-finder/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-finder</artifactId>
<name>XBean :: Classpath Resource Finder</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
Modified: geronimo/xbean/branches/colossus/xbean-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-jaxb/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-jaxb/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-jaxb/pom.xml Mon Jul 10 21:39:36 2006
@@ -21,13 +21,13 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-jaxb</artifactId>
<name>XBean :: JAXB</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<pluginRepositories>
<pluginRepository>
Modified: geronimo/xbean/branches/colossus/xbean-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-jmx/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-jmx/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-jmx/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean</artifactId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-jmx</artifactId>
<name>XBean :: JMX</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
Modified: geronimo/xbean/branches/colossus/xbean-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-kernel/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-kernel/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-kernel/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-kernel</artifactId>
<name>XBean :: Kernel</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
Modified: geronimo/xbean/branches/colossus/xbean-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-osgi/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-osgi/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-osgi/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-osgi</artifactId>
<name>XBean :: OSGi</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
Modified: geronimo/xbean/branches/colossus/xbean-oxm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-oxm/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-oxm/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-oxm/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-oxm</artifactId>
<name>XBean :: Object to XML Matcher</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
Modified: geronimo/xbean/branches/colossus/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-reflect/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-reflect/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,23 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-reflect</artifactId>
<name>XBean :: Reflect</name>
- <version>2.5-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>mx4j</groupId>
Modified: geronimo/xbean/branches/colossus/xbean-sca/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-sca/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-sca/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-sca/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean</artifactId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-sca</artifactId>
<name>XBean :: SCA</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
Modified: geronimo/xbean/branches/colossus/xbean-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-server/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,23 +2,15 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-server</artifactId>
<name>XBean :: Server</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
@@ -44,6 +36,10 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bootstrap</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
Added: geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/main/DaemonMain.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/main/DaemonMain.java?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/main/DaemonMain.java (added)
+++ geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/main/DaemonMain.java Mon Jul 10 21:39:36 2006
@@ -0,0 +1,163 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xbean.server.main;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * DaemonMain is a simple server entry point. This class will optionally call a next main and then hold the
+ * startup execution thread until System exit is triggered via the system shutdown hook.
+ *
+ * @org.apache.xbean.XBean namespace="http://xbean.apache.org/schemas/server" element="daemon-main"
+ * description="Simple server entry point."
+ *
+ * @author Dain Sundstrom
+ * @version $Id$
+ * @since 2.5-colossus
+ */
+public class DaemonMain implements Main {
+ /**
+ * Lock that should be acquired before accessing the running boolean flag.
+ */
+ private final Lock destroyLock = new ReentrantLock();
+
+ /**
+ * The condition that is notified when the kernel has been destroyed.
+ */
+ private final Condition destroyCondition = destroyLock.newCondition();
+
+ /**
+ * If true, the process is still running.
+ */
+ private boolean running;
+
+ /**
+ * The next main to call before capturing the startup execution thread.
+ */
+ private Main next;
+
+ /**
+ * Gets the next main to call before capturing the startup execution thread.
+ * @return the next main to call before capturing the startup execution thread
+ */
+ public Main getNext() {
+ return next;
+ }
+
+ /**
+ * Sets the next main to call before capturing the startup execution thread.
+ * @param next the next main to call before capturing the startup execution thread
+ */
+ public void setNext(Main next) {
+ this.next = next;
+ }
+
+ /**
+ * Calls the next (if present) and waits for the vm to be shutdown.
+ * @param args the arguments passed the next main
+ */
+ public void main(String[] args) {
+ // mark the daemon as started
+ destroyLock.lock();
+ try {
+ if (running) {
+ throw new IllegalStateException("The daemon is already running");
+ }
+ running = true;
+ } finally {
+ destroyLock.unlock();
+ }
+
+ try {
+ // if we have a child main class call it
+ if (next != null) {
+ next.main(args);
+ }
+
+ // add our shutdown hook
+ Runtime.getRuntime().addShutdownHook(new DemonShutdownHook());
+
+ // wait for the vm to be destroyed
+ awaitDestruction();
+ } finally {
+ // assure the daemon has been destroyed
+ destroy();
+ }
+ }
+
+ /**
+ * Destroy the daemon and notify all threads waiting for destruction.
+ */
+ public void destroy() {
+ destroyLock.lock();
+ try {
+ // if we are already stopped simply return
+ if (!running) {
+ return;
+ }
+ running = false;
+
+ destroyCondition.signalAll();
+ } finally {
+ destroyLock.unlock();
+ }
+ }
+
+ /**
+ * Uninterruptibly waits for the daemon to be destroyed via the system shudown hook or by a direct call of destroy.
+ */
+ public void awaitDestruction() {
+ while (true) {
+ destroyLock.lock();
+ try {
+ // if we are already stopped simply return
+ if (!running) {
+ return;
+ }
+
+ // wait until destroy completes
+ destroyCondition.awaitUninterruptibly();
+ } finally {
+ destroyLock.unlock();
+ }
+ }
+ }
+
+ /**
+ * Is this deamon still running?
+ * @return true if this daemon is still running.
+ */
+ public boolean isRunning() {
+ destroyLock.lock();
+ try {
+ return running;
+ } finally {
+ destroyLock.unlock();
+ }
+ }
+
+ private class DemonShutdownHook extends Thread {
+ /**
+ * Destroys the daemon.
+ */
+ public void run() {
+ DaemonMain.this.destroy();
+ }
+ }
+}
Modified: geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/spring/main/SpringBootstrap.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/spring/main/SpringBootstrap.java?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/spring/main/SpringBootstrap.java (original)
+++ geronimo/xbean/branches/colossus/xbean-server/src/main/java/org/apache/xbean/server/spring/main/SpringBootstrap.java Mon Jul 10 21:39:36 2006
@@ -18,17 +18,16 @@
import java.beans.PropertyEditorManager;
import java.io.File;
-import java.net.JarURLConnection;
import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
+import java.util.Properties;
+import org.apache.xbean.bootstrap.Bootstrap;
+import org.apache.xbean.bootstrap.BootstrapLoader;
import org.apache.xbean.server.main.FatalStartupError;
import org.apache.xbean.server.main.Main;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
@@ -38,17 +37,17 @@
/**
* SpringBootstrap is the main class used by a Spring based server. This class uses the following strategies to determine
* the configuration file to load:
- *
+ * <p/>
* Command line parameter --bootstrap FILE
* Manifest entry XBean-Bootstrap in the startup jar
* META-INF/xbean-bootstrap.xml
- *
+ * <p/>
* This class atempts to first load the configuration file from the local file system and if that fails it attempts to
* load it from the classpath.
- *
+ * <p/>
* SpringBootstrap expects the configuration to contain a service with the id "main" which is an implementation of
* org.apache.xbean.server.main.Main.
- *
+ * <p/>
* This class will set the system property xbean.base.dir to the directory containing the startup jar if the property
* has not alredy been set (on the command line).
*
@@ -56,53 +55,20 @@
* @version $Id$
* @since 2.0
*/
-public class SpringBootstrap {
- private static final String XBEAN_BOOTSTRAP_MANIFEST = "XBean-Bootstrap";
- private static final String BOOTSTRAP_FLAG = "--bootstrap";
- private static final String DEFAULT_BOOTSTRAP = "META-INF/xbean-bootstrap.xml";
- private static final List DEFAULT_PROPERTY_EDITOR_PATHS = Collections.singletonList("org.apache.xbean.server.propertyeditor");
+public class SpringBootstrap implements BootstrapLoader {
+ private static final String CONFIGURATION_FILE = "xbean.server.spring.configuration.file";
+ private static final String CONFIGURATION_FILE_DEFAULT = "conf/server.xml";
- private String configurationFile;
- private String[] mainArguments;
- private List propertyEditorPaths = DEFAULT_PROPERTY_EDITOR_PATHS;
- private String serverBaseDirectory;
+ private static final List<String> DEFAULT_PROPERTY_EDITOR_PATHS = Collections.singletonList("org.apache.xbean.server.propertyeditor");
- /**
- * Initializes and boots the server using the supplied arguments. If an error is thrown from the boot method,
- * this method will pring the error to standard error along with the stack trace and exit with the exit specified
- * in the FatalStartupError or exit code 9 if the error was not a FatalStartupError.
- * @param args the arguments used to start the server
- */
- public static void main(String[] args) {
- SpringBootstrap springBootstrap = new SpringBootstrap();
- main(args, springBootstrap);
- }
-
- /**
- * Like the main(args) method but allows a configured bootstrap instance to be passed in.
- *
- * @see #main(String[])
- */
- public static void main(String[] args, SpringBootstrap springBootstrap) {
- springBootstrap.initialize(args);
-
- try {
- springBootstrap.boot();
- } catch (FatalStartupError e) {
- System.err.println(e.getMessage());
- if (e.getCause() != null) {
- e.getCause().printStackTrace();
- }
- System.exit(e.getExitCode());
- } catch (Throwable e) {
- System.err.println("Unknown error");
- e.printStackTrace();
- System.exit(9);
- }
- }
+ private String homeDirectory;
+ private String configurationFile;
+ private List<String> propertyEditorPaths = DEFAULT_PROPERTY_EDITOR_PATHS;
+ private ClassLoader classLoader;
/**
* Gets the configuration file from which the main instance is loaded.
+ *
* @return the configuration file from which the main instance is loaded
*/
public String getConfigurationFile() {
@@ -111,6 +77,7 @@
/**
* Sets the configuration file from which the main instance is loaded.
+ *
* @param configurationFile the configuration file from which the main instance is loaded
*/
public void setConfigurationFile(String configurationFile) {
@@ -118,151 +85,139 @@
}
/**
- * Gets the arguments passed to the main instance.
- * @return the arguments passed to the main instance
+ * Gets the paths that are appended to the system property editors search path.
+ *
+ * @return the paths that are appended to the system property editors search path
*/
- public String[] getMainArguments() {
- return mainArguments;
+ public List<String> getPropertyEditorPaths() {
+ return propertyEditorPaths;
}
/**
- * Sets the arguments passed to the main instance.
- * @param mainArguments the arguments passed to the main instance
+ * Sets the paths that are appended to the system property editors search path.
+ *
+ * @param propertyEditorPaths the paths that are appended to the system property editors search path
*/
- public void setMainArguments(String[] mainArguments) {
- this.mainArguments = mainArguments;
+ public void setPropertyEditorPaths(List<String> propertyEditorPaths) {
+ this.propertyEditorPaths = propertyEditorPaths;
}
/**
- * Gets the paths that are appended to the system property editors search path.
- * @return the paths that are appended to the system property editors search path
+ * String the home directory of the server.
+ *
+ * @return the home directory of the server
*/
- public List getPropertyEditorPaths() {
- return propertyEditorPaths;
+ public String getHomeDirectory() {
+ return homeDirectory;
}
/**
- * Sets the paths that are appended to the system property editors search path.
- * @param propertyEditorPaths the paths that are appended to the system property editors search path
+ * Sets the home directory of the server.
+ *
+ * @param homeDirectory the home directory of the server
*/
- public void setPropertyEditorPaths(List propertyEditorPaths) {
- this.propertyEditorPaths = propertyEditorPaths;
+ public void setHomeDirectory(String homeDirectory) {
+ this.homeDirectory = homeDirectory;
}
/**
- * Gets the base directory of the server.
- * @return the base directory of the server
+ * Gets the class loader passed to the Spring application context.
+ *
+ * @return the class loader passed to the Spring application context
*/
- public String getServerBaseDirectory() {
- return serverBaseDirectory;
+ public ClassLoader getClassLoader() {
+ if (classLoader != null) {
+ return classLoader;
+ }
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ if (classLoader != null) {
+ return classLoader;
+ }
+ return getClass().getClassLoader();
}
/**
- * Sets the base directory of the server.
- * @param serverBaseDirectory the base directory of the server
+ * Sets the class loader passed to the Spring application context.
+ *
+ * @param classLoader the class loader passed to the Spring application context
*/
- public void setServerBaseDirectory(String serverBaseDirectory) {
- this.serverBaseDirectory = serverBaseDirectory;
+ public void setClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
}
/**
- * Determines the configuration file and server base directory.
- * @param args the arguments passed to main
+ * Initialized this spring bootstrap instance using the specified properties and invokes main.
*/
- public void initialize(String[] args) {
- // check if bootstrap configuration was specified on the command line
- if (args.length > 1 && BOOTSTRAP_FLAG.equals(args[0])) {
- configurationFile = args[1];
- this.mainArguments = new String[args.length - 2];
- System.arraycopy(args, 2, this.mainArguments, 0, args.length);
- } else {
- if (configurationFile == null) {
- configurationFile = DEFAULT_BOOTSTRAP;
- }
- this.mainArguments = args;
- }
+ public void boot(String[] args, Properties properties, ClassLoader classLoader) {
+ this.classLoader = classLoader;
- // Determine the xbean installation directory
- // guess from the location of the jar
- URL url = SpringBootstrap.class.getClassLoader().getResource("META-INF/startup-jar");
- if (url != null) {
- try {
- JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
- url = jarConnection.getJarFileURL();
-
- if (serverBaseDirectory == null) {
- URI baseURI = new URI(url.toString()).resolve("..");
- serverBaseDirectory = new File(baseURI).getAbsolutePath();
- }
+ initialize(properties);
- Manifest manifest;
- manifest = jarConnection.getManifest();
- Attributes mainAttributes = manifest.getMainAttributes();
- if (configurationFile == null) {
- configurationFile = mainAttributes.getValue(XBEAN_BOOTSTRAP_MANIFEST);
- }
- } catch (Exception e) {
- System.err.println("Could not determine xbean installation directory");
- e.printStackTrace();
- System.exit(9);
- return;
- }
- } else {
- if (serverBaseDirectory == null) {
- String dir = System.getProperty("xbean.base.dir", System.getProperty("user.dir"));
- serverBaseDirectory = new File(dir).getAbsolutePath();
- }
- }
+ main(args);
+ }
+
+ private void main(String[] args) {
+ // load the main instance
+ Main main = loadMain();
+
+ // start it up
+ main.main(args);
}
/**
- * Loads the main instance from the configuration file.
- * @return the main instance
+ * Sets the home directory and configuration file using the specified properties.
+ *
+ * @param properties the properties for initialization
*/
- public Main loadMain() {
- if (serverBaseDirectory == null) {
- throw new NullPointerException("serverBaseDirectory is null");
-
+ public void initialize(Properties properties) {
+ File homeDirectory = new File(properties.getProperty(Bootstrap.HOME_DIR));
+ if (!homeDirectory.isDirectory()) {
+ throw new IllegalArgumentException("XBean home directory is not a directory: " + homeDirectory);
}
- File baseDirectory = new File(serverBaseDirectory);
- if (!baseDirectory.isDirectory()) {
- throw new IllegalArgumentException("serverBaseDirectory is not a directory: " + serverBaseDirectory);
+ this.homeDirectory = homeDirectory.getAbsolutePath();
- }
if (configurationFile == null) {
- throw new NullPointerException("configurationFile is null");
+ configurationFile = properties.getProperty(CONFIGURATION_FILE, CONFIGURATION_FILE_DEFAULT);
+ }
+ }
+ public Main loadMain() {
+ File homeDirectory = new File(this.homeDirectory);
+ if (!homeDirectory.isDirectory()) {
+ throw new IllegalArgumentException("XBean home directory is not a directory: " + homeDirectory);
}
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(SpringBootstrap.class.getClassLoader());
+ Thread.currentThread().setContextClassLoader(getClassLoader());
try {
// add our property editors into the system
if (propertyEditorPaths != null && !propertyEditorPaths.isEmpty()) {
- List editorSearchPath = new LinkedList(Arrays.asList(PropertyEditorManager.getEditorSearchPath()));
+ List<String> editorSearchPath = new LinkedList<String>(Arrays.asList(PropertyEditorManager.getEditorSearchPath()));
editorSearchPath.addAll(propertyEditorPaths);
- PropertyEditorManager.setEditorSearchPath((String[]) editorSearchPath.toArray(new String[editorSearchPath.size()]));
+ PropertyEditorManager.setEditorSearchPath(editorSearchPath.toArray(new String[editorSearchPath.size()]));
}
- // set the server base directory system property
- System.setProperty("xbean.base.dir", baseDirectory.getAbsolutePath());
+ List xmlPreprocessors = new ArrayList();
+// FileSystemRepository repository = new FileSystemRepository(new File(homeDir, "repository"));
+// ClassLoaderXmlPreprocessor classLoaderXmlPreprocessor = new ClassLoaderXmlPreprocessor(repository);
+// xmlPreprocessors.add(classLoaderXmlPreprocessor);
// load the configuration file
SpringApplicationContext factory;
File file = new File(configurationFile);
if (!file.isAbsolute()) {
- file = new File(baseDirectory, configurationFile);
+ file = new File(homeDirectory, configurationFile);
}
if (file.canRead()) {
try {
// configuration file is on the local file system
- factory = new FileSystemXmlApplicationContext(file.toURL().toString());
+ factory = new FileSystemXmlApplicationContext(file.toURL().toString(), xmlPreprocessors);
} catch (MalformedURLException e) {
throw new FatalStartupError("Error creating url for bootstrap file", e);
}
} else {
// assume it is a classpath resource
- factory = new ClassPathXmlApplicationContext(configurationFile);
+ factory = new ClassPathXmlApplicationContext(configurationFile, xmlPreprocessors);
}
// get the main service from the configuration file
@@ -277,17 +232,5 @@
finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
- }
-
- /**
- * Loads the main instance from the Spring configuration file and executes it.
- */
- public void boot() {
- // load the main instance
- Main main = loadMain();
-
- // start it up
- main.main(mainArguments);
-
}
}
Added: geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/org/apache/xbean/bootstrap/BootstrapLoader
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/org/apache/xbean/bootstrap/BootstrapLoader?rev=420719&view=auto
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/org/apache/xbean/bootstrap/BootstrapLoader (added)
+++ geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/org/apache/xbean/bootstrap/BootstrapLoader Mon Jul 10 21:39:36 2006
@@ -0,0 +1 @@
+org.apache.xbean.server.spring.main.SpringBootstrap
\ No newline at end of file
Modified: geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/xbean-bootstrap.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/xbean-bootstrap.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/xbean-bootstrap.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-server/src/main/resources/META-INF/xbean-bootstrap.xml Mon Jul 10 21:39:36 2006
@@ -34,9 +34,9 @@
<constructor-arg index="0" value="xbean"/>
</bean>
- <s:file-system-repository id="repository" root="${xbean.base.dir}/repository"/>
+ <s:file-system-repository id="repository" root="${xbean.home.dir}/repository"/>
- <s:spring-loader id="springLoader" kernel="#kernel" baseDir="${xbean.base.dir}/conf">
+ <s:spring-loader id="springLoader" kernel="#kernel" baseDir="${xbean.home.dir}/conf">
<s:xmlPreprocessors>
<s:class-loader-xml-preprocessor repository="#repository"/>
</s:xmlPreprocessors>
Modified: geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/deployer/DeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/deployer/DeployerTest.java?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/deployer/DeployerTest.java (original)
+++ geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/deployer/DeployerTest.java Mon Jul 10 21:39:36 2006
@@ -27,9 +27,9 @@
public class DeployerTest extends TestCase {
public void testDeployer() throws Exception {
- SpringBootstrap bootstrap = new SpringBootstrap();
- bootstrap.setConfigurationFile("test-xbean-bootstrap.xml");
- SpringBootstrap.main(new String[0], bootstrap);
- Thread.sleep(5000);
+// SpringBootstrap bootstrap = new SpringBootstrap();
+// bootstrap.setConfigurationFile("test-xbean-bootstrap.xml");
+// SpringBootstrap.main(new String[0], bootstrap);
+// Thread.sleep(5000);
}
}
Modified: geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/spring/main/SpringBootstrapTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/spring/main/SpringBootstrapTest.java?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/spring/main/SpringBootstrapTest.java (original)
+++ geronimo/xbean/branches/colossus/xbean-server/src/test/java/org/apache/xbean/server/spring/main/SpringBootstrapTest.java Mon Jul 10 21:39:36 2006
@@ -20,6 +20,7 @@
import org.apache.xbean.kernel.Kernel;
import org.apache.xbean.kernel.KernelFactory;
import org.apache.xbean.server.main.KernelMain;
+import org.apache.xbean.bootstrap.Bootstrap;
/**
* @author Dain Sundstrom
@@ -32,23 +33,27 @@
public void testClasspathBootstrap() throws Exception{
springBootstrap.setConfigurationFile("META-INF/xbean-bootstrap.xml");
- springBootstrap.setServerBaseDirectory(basedir);
+ springBootstrap.setHomeDirectory(basedir);
assertBootable(springBootstrap);
}
public void testFileBootstrapWithAbsoluteConfigPath() throws Exception {
springBootstrap.setConfigurationFile(basedir + "/src/main/resources/META-INF/xbean-bootstrap.xml");
- springBootstrap.setServerBaseDirectory(basedir);
+ springBootstrap.setHomeDirectory(basedir);
assertBootable(springBootstrap);
}
public void testFileBootstrapWithRelativeConfigPath() throws Exception {
springBootstrap.setConfigurationFile("src/main/resources/META-INF/xbean-bootstrap.xml");
- springBootstrap.setServerBaseDirectory(basedir);
+ springBootstrap.setHomeDirectory(basedir);
assertBootable(springBootstrap);
}
private static void assertBootable(SpringBootstrap springBootstrap) {
+ // home dir system property is only set in the bootstrap code, so we must set it here
+ // since the test xml file uses this property
+ System.setProperty(Bootstrap.HOME_DIR, springBootstrap.getHomeDirectory());
+
// load the main instance
KernelMain main = (KernelMain) springBootstrap.loadMain();
Modified: geronimo/xbean/branches/colossus/xbean-server/src/test/resources/test-xbean-bootstrap.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-server/src/test/resources/test-xbean-bootstrap.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-server/src/test/resources/test-xbean-bootstrap.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-server/src/test/resources/test-xbean-bootstrap.xml Mon Jul 10 21:39:36 2006
@@ -22,9 +22,6 @@
<constructor-arg index="0" value="xbean" />
</bean>
- <!-- TODO use proper directory
- <s:file-system-repository id="repository" root="${xbean.base.dir}/../components"/>
- -->
<s:file-system-repository id="repository" root="src/test/repository" />
<!-- TODO use proper directory -->
Propchange: geronimo/xbean/branches/colossus/xbean-spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-common</artifactId>
<name>XBean :: Spring :: Common</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>mx4j</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -0,0 +1,10 @@
+
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.4/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.4/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.4/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-124</artifactId>
<name>XBean :: Spring :: ITests :: 124</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.5/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.5/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.5/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.5/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-125</artifactId>
<name>XBean :: Spring :: ITests :: 125</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.6/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.6/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.6/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.6/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-126</artifactId>
<name>XBean :: Spring :: ITests :: 126</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.7/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.7/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.7/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.7/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-127</artifactId>
<name>XBean :: Spring :: ITests :: 127</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.8/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.8/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.8/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/1.2.8/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-128</artifactId>
<name>XBean :: Spring :: ITests :: 128</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-m5/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-m5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-m5/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-m5/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-m5/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-20m5</artifactId>
<name>XBean :: Spring :: ITests :: 20m5</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-rc1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-rc1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-rc1/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-rc1/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/2.0-rc1/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-20rc1</artifactId>
<name>XBean :: Spring :: ITests :: 20rc1</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Propchange: geronimo/xbean/branches/colossus/xbean-spring-itests/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 10 21:39:36 2006
@@ -1,3 +1,10 @@
-target
-.classpath
+
+*.iml
+*.ipr
+*.iws
.project
+.classpath
+maven.log
+junit*.properties
+target
+.wtpmodules
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/core/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/core/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/core/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean-spring-itests</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests-core</artifactId>
<name>XBean :: Spring :: ITests :: Core</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: geronimo/xbean/branches/colossus/xbean-spring-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-itests/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-itests/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-itests/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-itests</artifactId>
<name>XBean :: Spring :: ITests</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<packaging>pom</packaging>
<modules>
<module>core</module>
Modified: geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-v1</artifactId>
<name>XBean :: Spring :: V1</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<testResources>
<testResource>
Modified: geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring-v2</artifactId>
<name>XBean :: Spring :: V2</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<testResources>
<testResource>
Modified: geronimo/xbean/branches/colossus/xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-spring</artifactId>
<name>XBean :: Spring</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<plugins>
<plugin>
Modified: geronimo/xbean/branches/colossus/xbean-telnet/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-telnet/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-telnet/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-telnet/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-telnet</artifactId>
<name>XBean :: Telnet</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<dependencies>
<dependency>
<groupId>groovy</groupId>
Modified: geronimo/xbean/branches/colossus/xbean-tiger/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-tiger/pom.xml?rev=420719&r1=420718&r2=420719&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-tiger/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-tiger/pom.xml Mon Jul 10 21:39:36 2006
@@ -2,12 +2,12 @@
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-tiger</artifactId>
<name>XBean :: Tiger</name>
- <version>2.5-SNAPSHOT</version>
+ <version>2.5-colossus</version>
<build>
<testResources>
<testResource>