Author: sgoeschl
Date: Fri Jul 18 08:21:20 2008
New Revision: 677935
URL: http://svn.apache.org/viewvc?rev=677935&view=rev
Log:
Initial import of fulcrum-servicemanager - this code was moved out of
fulcrum-yaafi.
Added:
turbine/fulcrum/trunk/servicemanager/
turbine/fulcrum/trunk/servicemanager/LICENSE.txt
turbine/fulcrum/trunk/servicemanager/NOTICE.txt
turbine/fulcrum/trunk/servicemanager/pom.xml
turbine/fulcrum/trunk/servicemanager/src/
turbine/fulcrum/trunk/servicemanager/src/java/
turbine/fulcrum/trunk/servicemanager/src/java/org/
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerService.java
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerServiceImpl.java
turbine/fulcrum/trunk/servicemanager/src/main/
turbine/fulcrum/trunk/servicemanager/src/main/assembly/
turbine/fulcrum/trunk/servicemanager/src/main/assembly/bin.xml
turbine/fulcrum/trunk/servicemanager/src/main/assembly/src.xml
turbine/fulcrum/trunk/servicemanager/src/site/
turbine/fulcrum/trunk/servicemanager/src/site/site.xml
turbine/fulcrum/trunk/servicemanager/src/test/
turbine/fulcrum/trunk/servicemanager/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/servicemanager/src/test/TestRoleConfig.xml
turbine/fulcrum/trunk/servicemanager/src/test/org/
turbine/fulcrum/trunk/servicemanager/src/test/org/apache/
turbine/fulcrum/trunk/servicemanager/src/test/org/apache/fulcrum/
turbine/fulcrum/trunk/servicemanager/src/test/org/apache/fulcrum/servicemanager/
turbine/fulcrum/trunk/servicemanager/src/test/org/apache/fulcrum/servicemanager/ServiceManagerServiceTest.java
turbine/fulcrum/trunk/servicemanager/xdocs/
turbine/fulcrum/trunk/servicemanager/xdocs/configuration.xml
turbine/fulcrum/trunk/servicemanager/xdocs/index.xml
Added: turbine/fulcrum/trunk/servicemanager/LICENSE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/LICENSE.txt?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/LICENSE.txt (added)
+++ turbine/fulcrum/trunk/servicemanager/LICENSE.txt Fri Jul 18 08:21:20 2008
@@ -0,0 +1,202 @@
+
+ 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: turbine/fulcrum/trunk/servicemanager/NOTICE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/NOTICE.txt?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/NOTICE.txt (added)
+++ turbine/fulcrum/trunk/servicemanager/NOTICE.txt Fri Jul 18 08:21:20 2008
@@ -0,0 +1,6 @@
+Turbine Fulcrum ServiceManager
+Copyright 2002-2007 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
Added: turbine/fulcrum/trunk/servicemanager/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/pom.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/pom.xml (added)
+++ turbine/fulcrum/trunk/servicemanager/pom.xml Fri Jul 18 08:21:20 2008
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project
+ 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>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>fulcrum-servicemanager</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Fulcrum ServiceManager</name>
+ <inceptionYear>2008</inceptionYear>
+ <description>Fulcrum ServiceManager Service</description>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-servicemanager</url>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/servicemanager/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/servicemanager/</developerConnection>
+
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/servicemanager/</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>fulcrum.website</id>
+ <name>Fulcrum Website</name>
+
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-servicemanager/</url>
+ </site>
+ </distributionManagement>
+
+ <developers>
+ <developer>
+ <name>Siegfried Goeschl</name>
+ <id>sgoeschl</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.6-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.6-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
+ </build>
+
+</project>
Added:
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerService.java?rev=677935&view=auto
==============================================================================
---
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerService.java
(added)
+++
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerService.java
Fri Jul 18 08:21:20 2008
@@ -0,0 +1,70 @@
+package org.apache.fulcrum.servicemanager;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.configuration.Configuration;
+
+/**
+ * Let's try to break the singleton addiction with this service. This
+ * service stores the instance of a service manager and allows access
+ * to this instance and related information such as
+ *
+ * <ul>
+ * <li>Logger instance
+ * <li>ServiceManager instance
+ * <li>Context instance
+ * <li>Configuration instance
+ * <li>Parameters instance
+ * </ul>
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Siegfried Goeschl</a>
+ */
+
+public interface ServiceManagerService extends ServiceManager
+{
+ /**
+ * @return the Logger of this service
+ */
+ Logger getLogger();
+
+ /**
+ * @return the ServiceManager for the container
+ */
+ ServiceManager getServiceManager();
+
+ /**
+ * @return the Parameters for the container
+ */
+ Parameters getParameters();
+
+ /**
+ * @return the Context for the container
+ */
+ Context getContext();
+
+ /**
+ * @return the Configuration for this service
+ */
+ Configuration getConfiguration();
+}
Added:
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerServiceImpl.java?rev=677935&view=auto
==============================================================================
---
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerServiceImpl.java
(added)
+++
turbine/fulcrum/trunk/servicemanager/src/java/org/apache/fulcrum/servicemanager/ServiceManagerServiceImpl.java
Fri Jul 18 08:21:20 2008
@@ -0,0 +1,232 @@
+package org.apache.fulcrum.servicemanager;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.parameters.ParameterException;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.Reconfigurable;
+
+/**
+ * This is a sort of "edelhack" to solve the problem of accessing
+ * the Avalon infrastructure without having an instance of the
+ * container. The implementation stores the very first instance
+ * of itself in a static variable which can be accessed using
+ * getInstance().
+ *
+ * This allows access to the various Avalon artifacts.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Siegfried Goeschl</a>
+ */
+
+public class ServiceManagerServiceImpl
+ implements ServiceManagerService, LogEnabled, Contextualizable,
Reconfigurable, Parameterizable, Serviceable, Disposable
+{
+ /** The one and only instance */
+ private static ServiceManagerServiceImpl instance;
+
+ /** Store the Avalon logger */
+ private Logger logger;
+
+ /** Store the ServiceContainer on a per instance base */
+ private ServiceManager serviceManager;
+
+ /** Store the passed parameters on a per instance base */
+ private Parameters parameters;
+
+ /** Store the passed context on a per instance base */
+ private Context context;
+
+ /** Store the passed configuration on a per instance base */
+ private Configuration configuration;
+
+ /**
+ * Constructor
+ */
+ public ServiceManagerServiceImpl()
+ {
+ setInstance(this);
+ }
+
+ /////////////////////////////////////////////////////////////////////////
+ // Avalon Lifecycle Implementation
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * @see
org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
+ */
+ public void enableLogging(Logger logger)
+ {
+ this.logger = logger;
+ }
+
+ /**
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager serviceManager) throws ServiceException
+ {
+ this.serviceManager = serviceManager;
+ }
+
+ /**
+ * @see
org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
+ */
+ public void contextualize(Context context) throws ContextException
+ {
+ this.context = context;
+ }
+
+ /**
+ * @see
org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+ */
+ public void configure(Configuration configuration) throws
ConfigurationException
+ {
+ this.configuration = configuration;
+ }
+
+ /**
+ * @see
org.apache.avalon.framework.configuration.Reconfigurable#reconfigure(org.apache.avalon.framework.configuration.Configuration)
+ */
+ public void reconfigure(Configuration configuration) throws
ConfigurationException
+ {
+ this.configuration = configuration;
+ }
+
+ /**
+ * @see
org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
+ */
+ public void parameterize(Parameters parameters) throws ParameterException
+ {
+ this.parameters = parameters;
+ }
+
+ /**
+ * @see org.apache.avalon.framework.activity.Disposable#dispose()
+ */
+ public void dispose()
+ {
+ this.serviceManager = null;
+ this.parameters = null;
+ this.context = null;
+ this.configuration = null;
+ this.logger = null;
+ ServiceManagerServiceImpl.instance = null;
+ }
+
+ /////////////////////////////////////////////////////////////////////////
+ // Service Interface Implementation
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * @see
org.apache.avalon.framework.service.ServiceManager#hasService(java.lang.String)
+ */
+ public boolean hasService(String name)
+ {
+ return this.serviceManager.hasService(name);
+ }
+
+ /**
+ * @see
org.apache.avalon.framework.service.ServiceManager#lookup(java.lang.String)
+ */
+ public Object lookup(String name) throws ServiceException
+ {
+ return this.serviceManager.lookup(name);
+ }
+
+ /**
+ * @see
org.apache.avalon.framework.service.ServiceManager#release(java.lang.Object)
+ */
+ public void release(Object object)
+ {
+ this.serviceManager.release(object);
+ }
+
+ /**
+ * @return the ServiceManager for the container
+ */
+ public ServiceManager getServiceManager()
+ {
+ return this.serviceManager;
+ }
+
+ /**
+ * @return the Parameters for the container
+ */
+ public Parameters getParameters()
+ {
+ return this.parameters;
+ }
+
+ /**
+ * @return the Context for the container
+ */
+ public Context getContext()
+ {
+ return this.context;
+ }
+
+ /**
+ * @see org.apache.fulcrum.servicemanager.ServiceManagerService#getLogger()
+ */
+ public Logger getLogger()
+ {
+ return this.logger;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.servicemanager.ServiceManagerService#getConfiguration()
+ */
+ public Configuration getConfiguration()
+ {
+ return this.configuration;
+ }
+
+ /////////////////////////////////////////////////////////////////////////
+ // Service Implementation
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * @return the one and only instance of this class
+ */
+ public static synchronized ServiceManagerService getInstance()
+ {
+ return instance;
+ }
+
+ /**
+ * Create the one and only instance
+ * @param instance the instance
+ */
+ protected static synchronized void setInstance( ServiceManagerServiceImpl
instance )
+ {
+ ServiceManagerServiceImpl.instance = instance;
+ }
+}
Added: turbine/fulcrum/trunk/servicemanager/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/main/assembly/bin.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/src/main/assembly/bin.xml (added)
+++ turbine/fulcrum/trunk/servicemanager/src/main/assembly/bin.xml Fri Jul 18
08:21:20 2008
@@ -0,0 +1,43 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: turbine/fulcrum/trunk/servicemanager/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/main/assembly/src.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/src/main/assembly/src.xml (added)
+++ turbine/fulcrum/trunk/servicemanager/src/main/assembly/src.xml Fri Jul 18
08:21:20 2008
@@ -0,0 +1,41 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${artifactId}-${version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>build.xml</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>pom.xml</include>
+ <include>STATUS</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ <fileSet>
+ <directory>xdocs</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: turbine/fulcrum/trunk/servicemanager/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/site/site.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/src/site/site.xml (added)
+++ turbine/fulcrum/trunk/servicemanager/src/site/site.xml Fri Jul 18 08:21:20
2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project name="Fulcrum ServiceManager Service">
+ <body>
+ <menu name="Overview">
+ <item name="About" href="/index.html"/>
+ <item name="Configuration" href="/configuration.html"/>
+ </menu>
+ ${reports}
+ </body>
+</project>
Added: turbine/fulcrum/trunk/servicemanager/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/test/TestComponentConfig.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/src/test/TestComponentConfig.xml
(added)
+++ turbine/fulcrum/trunk/servicemanager/src/test/TestComponentConfig.xml Fri
Jul 18 08:21:20 2008
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<componentConfig>
+ <ServiceManagerService>
+ <foo>bar</foo>
+ </ServiceManagerService>
+</componentConfig>
Added: turbine/fulcrum/trunk/servicemanager/src/test/TestRoleConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/test/TestRoleConfig.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/src/test/TestRoleConfig.xml (added)
+++ turbine/fulcrum/trunk/servicemanager/src/test/TestRoleConfig.xml Fri Jul 18
08:21:20 2008
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+
+<role-list>
+ <role
+ name="org.apache.fulcrum.servicemanager.ServiceManagerService"
+ default-class="org.apache.fulcrum.servicemanager.ServiceManagerServiceImpl"
+ shorthand="ServiceManagerService"
+ />
+</role-list>
Added:
turbine/fulcrum/trunk/servicemanager/src/test/org/apache/fulcrum/servicemanager/ServiceManagerServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/src/test/org/apache/fulcrum/servicemanager/ServiceManagerServiceTest.java?rev=677935&view=auto
==============================================================================
---
turbine/fulcrum/trunk/servicemanager/src/test/org/apache/fulcrum/servicemanager/ServiceManagerServiceTest.java
(added)
+++
turbine/fulcrum/trunk/servicemanager/src/test/org/apache/fulcrum/servicemanager/ServiceManagerServiceTest.java
Fri Jul 18 08:21:20 2008
@@ -0,0 +1,84 @@
+package org.apache.fulcrum.servicemanager;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.fulcrum.testcontainer.BaseUnitTest;
+
+/**
+ * Test suite for the ServiceManagereService.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Siegfried Goeschl</a>
+ */
+
+public class ServiceManagerServiceTest extends BaseUnitTest
+{
+ /** the service under test */
+ private ServiceManagerService service;
+
+ /**
+ * Constructor
+ * @param name the name of the test case
+ */
+ public ServiceManagerServiceTest( String name )
+ {
+ super(name);
+ }
+
+ /**
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ this.service = (ServiceManagerService)
this.resolve(ServiceManagerService.class.getName());
+ }
+
+ /**
+ * Access the ServiceManagerService
+ */
+ public void testServiceManagerService() throws Exception
+ {
+ assertNotNull(service);
+
+ // test acessing the logger
+ assertNotNull( this.service.getLogger() );
+ Logger logger = this.service.getLogger();
+ logger.warn("Hello Avalon");
+
+ // test accessing the context
+ assertNotNull( this.service.getContext() );
+
+ // get the parameters
+ assertNotNull(this.service.getParameters());
+
+ // get the configuration and access <foo>bar</foo>
+ Configuration configuration = this.service.getConfiguration();
+ assertEquals(configuration.getChild("foo").getValue(), "bar");
+
+ // lookup the service
+ service = (ServiceManagerService) this.service.lookup(
ServiceManagerService.class.getName() );
+ assertTrue( service.hasService( ServiceManagerService.class.getName()
) );
+ assertTrue( service.getServiceManager() instanceof ServiceManager );
+ service.release(service);
+ }
+}
Added: turbine/fulcrum/trunk/servicemanager/xdocs/configuration.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/xdocs/configuration.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/xdocs/configuration.xml (added)
+++ turbine/fulcrum/trunk/servicemanager/xdocs/configuration.xml Fri Jul 18
08:21:20 2008
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<document>
+ <properties>
+ <title>Fulcrum ServiceManager Service</title>
+ <author email="[EMAIL PROTECTED]">Siegfried Goeschl</author>
+ </properties>
+ <body>
+ <section name="Configuration">
+
+ <subsection name="Role Configuration">
+ <source><![CDATA[
+<role
+ name="org.apache.fulcrum.servicemanager.ServiceManagerService"
+ default-class="org.apache.fulcrum.servicemanager.ServiceManagerServiceImpl"
+ shorthand="ServiceManagerService"
+/>
+ ]]></source>
+ </subsection>
+
+ <subsection name="Component Configuration">
+ <p>
+ If needed you can define an arbitrary configuration which
+ is not used by the ServiceManagerService but picked up
+ by your application.
+ </p>
+ <source><![CDATA[
+<ServiceManagerService>
+ <foo>bar</foo>
+</ServiceManagerService>
+ ]]></source>
+ </subsection>
+
+ </section>
+ </body>
+</document>
Added: turbine/fulcrum/trunk/servicemanager/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/servicemanager/xdocs/index.xml?rev=677935&view=auto
==============================================================================
--- turbine/fulcrum/trunk/servicemanager/xdocs/index.xml (added)
+++ turbine/fulcrum/trunk/servicemanager/xdocs/index.xml Fri Jul 18 08:21:20
2008
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<document>
+ <properties>
+ <title>Fulcrum ServiceManager Service</title>
+ <author email="[EMAIL PROTECTED]">Siegfried Goeschl</author>
+ </properties>
+ <body>
+ <section name="Overview">
+ <p>
+ This service breaks the singleton addiction when acessing
+ an Avalon container created somewhere else in the application.
+ The implementation stores the instance of a service manager
+ and allows access to this instance and related information such as
+ <ul>
+ <li>the Avalon logger of the service</li>
+ <li>the Avalon ServiceManager instance to lookup services</li>
+ <li>the Avalon Context instance of the container</li>
+ <li>the Avalon Configuration instance of the service</li>
+ <li>the Avalon Parameters instance of the container</li>
+ </ul>
+ </p>
+ </section>
+ </body>
+</document>
