felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r529623 [9/9] - in /incubator/felix/trunk: ./ ipojo.arch/ ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ ipojo.metadata/ ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/ ipojo.plugin/ ipojo.plugin/src/main/java/org/apach...
Date Tue, 17 Apr 2007 14:31:47 GMT
Modified: incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedService.java?view=diff&rev=529623&r1=529622&r2=529623
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedService.java (original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedService.java Tue
Apr 17 07:31:35 2007
@@ -1,19 +1,21 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedService.java,v
1.11 2006/03/14 01:21:09 hargrave Exp $
- *
+ * $Header:
+ * /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedService.java,v
+ * 1.11 2006/03/14 01:21:09 hargrave Exp $
+ * 
  * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
- *
- * 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
- *
+ * 
+ * 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.
+ * 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.osgi.service.cm;
 
@@ -110,31 +112,30 @@
  * @version $Revision: 1.11 $
  */
 public interface ManagedService {
-	/**
-	 * Update the configuration for a Managed Service.
-	 * 
-	 * <p>
-	 * When the implementation of <code>updated(Dictionary)</code> detects any
-	 * kind of error in the configuration properties, it should create a new
-	 * <code>ConfigurationException</code> which describes the problem. This
-	 * can allow a management system to provide useful information to a human
-	 * administrator.
-	 * 
-	 * <p>
-	 * If this method throws any other <code>Exception</code>, the
-	 * Configuration Admin service must catch it and should log it.
-	 * <p>
-	 * The Configuration Admin service must call this method asynchronously
-	 * which initiated the callback. This implies that implementors of Managed
-	 * Service can be assured that the callback will not take place during
-	 * registration when they execute the registration in a synchronized method.
-	 * 
-	 * @param properties A copy of the Configuration properties, or
-	 *        <code>null</code>. This argument must not contain the
-	 *        "service.bundleLocation" property. The value of this property may
-	 *        be obtained from the <code>Configuration.getBundleLocation</code>
-	 *        method.
-	 * @throws ConfigurationException when the update fails
-	 */
-	public void updated(Dictionary properties) throws ConfigurationException;
+    /**
+     * Update the configuration for a Managed Service.
+     * 
+     * <p>
+     * When the implementation of <code>updated(Dictionary)</code> detects any
+     * kind of error in the configuration properties, it should create a new
+     * <code>ConfigurationException</code> which describes the problem. This
+     * can allow a management system to provide useful information to a human
+     * administrator.
+     * 
+     * <p>
+     * If this method throws any other <code>Exception</code>, the
+     * Configuration Admin service must catch it and should log it.
+     * <p>
+     * The Configuration Admin service must call this method asynchronously
+     * which initiated the callback. This implies that implementors of Managed
+     * Service can be assured that the callback will not take place during
+     * registration when they execute the registration in a synchronized method.
+     * 
+     * @param properties A copy of the Configuration properties, or
+     * <code>null</code>. This argument must not contain the
+     * "service.bundleLocation" property. The value of this property may be
+     * obtained from the <code>Configuration.getBundleLocation</code> method.
+     * @throws ConfigurationException when the update fails
+     */
+    public void updated(Dictionary properties) throws ConfigurationException;
 }

Modified: incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java?view=diff&rev=529623&r1=529622&r2=529623
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
(original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
Tue Apr 17 07:31:35 2007
@@ -1,19 +1,21 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedServiceFactory.java,v
1.10 2006/03/14 01:21:09 hargrave Exp $
- *
+ * $Header:
+ * /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedServiceFactory.java,v
+ * 1.10 2006/03/14 01:21:09 hargrave Exp $
+ * 
  * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
- *
- * 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
- *
+ * 
+ * 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.
+ * 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.osgi.service.cm;
 
@@ -97,66 +99,65 @@
  * @version $Revision: 1.10 $
  */
 public interface ManagedServiceFactory {
-	/**
-	 * Return a descriptive name of this factory.
-	 * 
-	 * @return the name for the factory, which might be localized
-	 */
-	public String getName();
+    /**
+     * Return a descriptive name of this factory.
+     * 
+     * @return the name for the factory, which might be localized
+     */
+    public String getName();
 
-	/**
-	 * Create a new instance, or update the configuration of an existing
-	 * instance.
-	 * 
-	 * If the PID of the <code>Configuration</code> object is new for the
-	 * Managed Service Factory, then create a new factory instance, using the
-	 * configuration <code>properties</code> provided. Else, update the
-	 * service instance with the provided <code>properties</code>.
-	 * 
-	 * <p>
-	 * If the factory instance is registered with the Framework, then the
-	 * configuration <code>properties</code> should be copied to its registry
-	 * properties. This is not mandatory and security sensitive properties
-	 * should obviously not be copied.
-	 * 
-	 * <p>
-	 * If this method throws any <code>Exception</code>, the Configuration
-	 * Admin service must catch it and should log it.
-	 * 
-	 * <p>
-	 * When the implementation of updated detects any kind of error in the
-	 * configuration properties, it should create a new
-	 * {@link ConfigurationException}which describes the problem.
-	 * 
-	 * <p>
-	 * The Configuration Admin service must call this method asynchronously.
-	 * This implies that implementors of the <code>ManagedServiceFactory</code>
-	 * class can be assured that the callback will not take place during
-	 * registration when they execute the registration in a synchronized method.
-	 * 
-	 * @param pid The PID for this configuration.
-	 * @param properties A copy of the configuration properties. This argument
-	 *        must not contain the service.bundleLocation" property. The value
-	 *        of this property may be obtained from the
-	 *        <code>Configuration.getBundleLocation</code> method.
-	 * @throws ConfigurationException when the configuration properties are
-	 *         invalid.
-	 */
-	public void updated(String pid, Dictionary properties)
-			throws ConfigurationException;
+    /**
+     * Create a new instance, or update the configuration of an existing
+     * instance.
+     * 
+     * If the PID of the <code>Configuration</code> object is new for the
+     * Managed Service Factory, then create a new factory instance, using the
+     * configuration <code>properties</code> provided. Else, update the
+     * service instance with the provided <code>properties</code>.
+     * 
+     * <p>
+     * If the factory instance is registered with the Framework, then the
+     * configuration <code>properties</code> should be copied to its registry
+     * properties. This is not mandatory and security sensitive properties
+     * should obviously not be copied.
+     * 
+     * <p>
+     * If this method throws any <code>Exception</code>, the Configuration
+     * Admin service must catch it and should log it.
+     * 
+     * <p>
+     * When the implementation of updated detects any kind of error in the
+     * configuration properties, it should create a new
+     * {@link ConfigurationException}which describes the problem.
+     * 
+     * <p>
+     * The Configuration Admin service must call this method asynchronously.
+     * This implies that implementors of the <code>ManagedServiceFactory</code>
+     * class can be assured that the callback will not take place during
+     * registration when they execute the registration in a synchronized method.
+     * 
+     * @param pid The PID for this configuration.
+     * @param properties A copy of the configuration properties. This argument
+     * must not contain the service.bundleLocation" property. The value of this
+     * property may be obtained from the
+     * <code>Configuration.getBundleLocation</code> method.
+     * @throws ConfigurationException when the configuration properties are
+     * invalid.
+     */
+    public void updated(String pid, Dictionary properties) throws ConfigurationException;
 
-	/**
-	 * Remove a factory instance.
-	 * 
-	 * Remove the factory instance associated with the PID. If the instance was
-	 * registered with the service registry, it should be unregistered.
-	 * <p>
-	 * If this method throws any <code>Exception</code>, the Configuration
-	 * Admin service must catch it and should log it.
-	 * <p>
-	 * The Configuration Admin service must call this method asynchronously.
-	 * 
-	 * @param pid the PID of the service to be removed
-	 */
-	public void deleted(String pid);
+    /**
+     * Remove a factory instance.
+     * 
+     * Remove the factory instance associated with the PID. If the instance was
+     * registered with the service registry, it should be unregistered.
+     * <p>
+     * If this method throws any <code>Exception</code>, the Configuration
+     * Admin service must catch it and should log it.
+     * <p>
+     * The Configuration Admin service must call this method asynchronously.
+     * 
+     * @param pid the PID of the service to be removed
+     */
+    public void deleted(String pid);
 }

Modified: incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogEntry.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogEntry.java?view=diff&rev=529623&r1=529622&r2=529623
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogEntry.java (original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogEntry.java Tue Apr 17
07:31:35 2007
@@ -1,19 +1,21 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogEntry.java,v
1.9 2006/06/16 16:31:49 hargrave Exp $
- *
+ * $Header:
+ * /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogEntry.java,v
+ * 1.9 2006/06/16 16:31:49 hargrave Exp $
+ * 
  * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
- *
- * 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
- *
+ * 
+ * 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.
+ * 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.osgi.service.log;
 
@@ -34,76 +36,76 @@
  * @see LogListener
  */
 public interface LogEntry {
-	/**
-	 * Returns the bundle that created this <code>LogEntry</code> object.
-	 * 
-	 * @return The bundle that created this <code>LogEntry</code> object;
-	 *         <code>null</code> if no bundle is associated with this
-	 *         <code>LogEntry</code> object.
-	 */
-	public Bundle getBundle();
-
-	/**
-	 * Returns the <code>ServiceReference</code> object for the service associated
-	 * with this <code>LogEntry</code> object.
-	 * 
-	 * @return <code>ServiceReference</code> object for the service associated
-	 *         with this <code>LogEntry</code> object; <code>null</code>
if no
-	 *         <code>ServiceReference</code> object was provided.
-	 */
-	public ServiceReference getServiceReference();
-
-	/**
-	 * Returns the severity level of this <code>LogEntry</code> object.
-	 * 
-	 * <p>
-	 * This is one of the severity levels defined by the <code>LogService</code>
-	 * interface.
-	 * 
-	 * @return Severity level of this <code>LogEntry</code> object.
-	 * 
-	 * @see LogService#LOG_ERROR
-	 * @see LogService#LOG_WARNING
-	 * @see LogService#LOG_INFO
-	 * @see LogService#LOG_DEBUG
-	 */
-	public int getLevel();
-
-	/**
-	 * Returns the human readable message associated with this <code>LogEntry</code>
-	 * object.
-	 * 
-	 * @return <code>String</code> containing the message associated with this
-	 *         <code>LogEntry</code> object.
-	 */
-	public String getMessage();
-
-	/**
-	 * Returns the exception object associated with this <code>LogEntry</code>
-	 * object.
-	 * 
-	 * <p>
-	 * In some implementations, the returned exception may not be the original
-	 * exception. To avoid references to a bundle defined exception class, thus
-	 * preventing an uninstalled bundle from being garbage collected, the Log
-	 * Service may return an exception object of an implementation defined
-	 * Throwable subclass. The returned object will attempt to provide as much
-	 * information as possible from the original exception object such as the
-	 * message and stack trace.
-	 * 
-	 * @return <code>Throwable</code> object of the exception associated with this
-	 *         <code>LogEntry</code>;<code>null</code> if no exception
is
-	 *         associated with this <code>LogEntry</code> object.
-	 */
-	public Throwable getException();
-
-	/**
-	 * Returns the value of <code>currentTimeMillis()</code> at the time this
-	 * <code>LogEntry</code> object was created.
-	 * 
-	 * @return The system time in milliseconds when this <code>LogEntry</code>
-	 *         object was created.
-	 * @see "System.currentTimeMillis()"
-	 */
-	public long getTime();
+    /**
+     * Returns the bundle that created this <code>LogEntry</code> object.
+     * 
+     * @return The bundle that created this <code>LogEntry</code> object;
+     * <code>null</code> if no bundle is associated with this
+     * <code>LogEntry</code> object.
+     */
+    public Bundle getBundle();
+
+    /**
+     * Returns the <code>ServiceReference</code> object for the service
+     * associated with this <code>LogEntry</code> object.
+     * 
+     * @return <code>ServiceReference</code> object for the service associated
+     * with this <code>LogEntry</code> object; <code>null</code>
if no
+     * <code>ServiceReference</code> object was provided.
+     */
+    public ServiceReference getServiceReference();
+
+    /**
+     * Returns the severity level of this <code>LogEntry</code> object.
+     * 
+     * <p>
+     * This is one of the severity levels defined by the <code>LogService</code>
+     * interface.
+     * 
+     * @return Severity level of this <code>LogEntry</code> object.
+     * 
+     * @see LogService#LOG_ERROR
+     * @see LogService#LOG_WARNING
+     * @see LogService#LOG_INFO
+     * @see LogService#LOG_DEBUG
+     */
+    public int getLevel();
+
+    /**
+     * Returns the human readable message associated with this
+     * <code>LogEntry</code> object.
+     * 
+     * @return <code>String</code> containing the message associated with this
+     * <code>LogEntry</code> object.
+     */
+    public String getMessage();
+
+    /**
+     * Returns the exception object associated with this <code>LogEntry</code>
+     * object.
+     * 
+     * <p>
+     * In some implementations, the returned exception may not be the original
+     * exception. To avoid references to a bundle defined exception class, thus
+     * preventing an uninstalled bundle from being garbage collected, the Log
+     * Service may return an exception object of an implementation defined
+     * Throwable subclass. The returned object will attempt to provide as much
+     * information as possible from the original exception object such as the
+     * message and stack trace.
+     * 
+     * @return <code>Throwable</code> object of the exception associated with
+     * this <code>LogEntry</code>;<code>null</code> if no exception
is
+     * associated with this <code>LogEntry</code> object.
+     */
+    public Throwable getException();
+
+    /**
+     * Returns the value of <code>currentTimeMillis()</code> at the time this
+     * <code>LogEntry</code> object was created.
+     * 
+     * @return The system time in milliseconds when this <code>LogEntry</code>
+     * object was created.
+     * @see "System.currentTimeMillis()"
+     */
+    public long getTime();
 }

Modified: incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogListener.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogListener.java?view=diff&rev=529623&r1=529622&r2=529623
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogListener.java (original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogListener.java Tue Apr
17 07:31:35 2007
@@ -1,34 +1,37 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogListener.java,v
1.9 2006/06/16 16:31:49 hargrave Exp $
- *
+ * $Header:
+ * /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogListener.java,v
+ * 1.9 2006/06/16 16:31:49 hargrave Exp $
+ * 
  * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
- *
- * 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
- *
+ * 
+ * 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.
+ * 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.osgi.service.log;
 
 import java.util.EventListener;
 
 /**
- * Subscribes to <code>LogEntry</code> objects from the <code>LogReaderService</code>.
+ * Subscribes to <code>LogEntry</code> objects from the
+ * <code>LogReaderService</code>.
  * 
  * <p>
- * A <code>LogListener</code> object may be registered with the Log Reader Service
- * using the <code>LogReaderService.addLogListener</code> method. After the
- * listener is registered, the <code>logged</code> method will be called for
each
- * <code>LogEntry</code> object created. The <code>LogListener</code>
object may be
- * unregistered by calling the <code>LogReaderService.removeLogListener</code>
- * method.
+ * A <code>LogListener</code> object may be registered with the Log Reader
+ * Service using the <code>LogReaderService.addLogListener</code> method.
+ * After the listener is registered, the <code>logged</code> method will be
+ * called for each <code>LogEntry</code> object created. The
+ * <code>LogListener</code> object may be unregistered by calling the
+ * <code>LogReaderService.removeLogListener</code> method.
  * 
  * @version $Revision: 1.9 $
  * @see LogReaderService
@@ -37,15 +40,15 @@
  * @see LogReaderService#removeLogListener(LogListener)
  */
 public interface LogListener extends EventListener {
-	/**
-	 * Listener method called for each LogEntry object created.
-	 * 
-	 * <p>
-	 * As with all event listeners, this method should return to its caller as
-	 * soon as possible.
-	 * 
-	 * @param entry A <code>LogEntry</code> object containing log information.
-	 * @see LogEntry
-	 */
-	public void logged(LogEntry entry);
+    /**
+     * Listener method called for each LogEntry object created.
+     * 
+     * <p>
+     * As with all event listeners, this method should return to its caller as
+     * soon as possible.
+     * 
+     * @param entry A <code>LogEntry</code> object containing log information.
+     * @see LogEntry
+     */
+    public void logged(LogEntry entry);
 }

Modified: incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogReaderService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogReaderService.java?view=diff&rev=529623&r1=529622&r2=529623
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogReaderService.java (original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogReaderService.java Tue
Apr 17 07:31:35 2007
@@ -1,19 +1,21 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogReaderService.java,v
1.10 2006/06/16 16:31:49 hargrave Exp $
- *
+ * $Header:
+ * /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogReaderService.java,v
+ * 1.10 2006/06/16 16:31:49 hargrave Exp $
+ * 
  * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
- *
- * 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
- *
+ * 
+ * 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.
+ * 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.osgi.service.log;
 
@@ -24,12 +26,13 @@
  * <p>
  * There are two ways to retrieve <code>LogEntry</code> objects:
  * <ul>
- * <li>The primary way to retrieve <code>LogEntry</code> objects is to
register a
- * <code>LogListener</code> object whose <code>LogListener.logged</code>
method will
- * be called for each entry added to the log.
- * <li>To retrieve past <code>LogEntry</code> objects, the <code>getLog</code>
- * method can be called which will return an <code>Enumeration</code> of all
- * <code>LogEntry</code> objects in the log.
+ * <li>The primary way to retrieve <code>LogEntry</code> objects is to
+ * register a <code>LogListener</code> object whose
+ * <code>LogListener.logged</code> method will be called for each entry added
+ * to the log.
+ * <li>To retrieve past <code>LogEntry</code> objects, the
+ * <code>getLog</code> method can be called which will return an
+ * <code>Enumeration</code> of all <code>LogEntry</code> objects
in the log.
  * 
  * @version $Revision: 1.10 $
  * @see LogEntry
@@ -37,62 +40,64 @@
  * @see LogListener#logged(LogEntry)
  */
 public interface LogReaderService {
-	/**
-	 * Subscribes to <code>LogEntry</code> objects.
-	 * 
-	 * <p>
-	 * This method registers a <code>LogListener</code> object with the Log Reader
-	 * Service. The <code>LogListener.logged(LogEntry)</code> method will be
-	 * called for each <code>LogEntry</code> object placed into the log.
-	 * 
-	 * <p>
-	 * When a bundle which registers a <code>LogListener</code> object is stopped
-	 * or otherwise releases the Log Reader Service, the Log Reader Service must
-	 * remove all of the bundle's listeners.
-	 * 
-	 * <p>
-	 * If this Log Reader Service's list of listeners already contains a
-	 * listener <code>l</code> such that <code>(l==listener)</code>,
this method
-	 * does nothing.
-	 * 
-	 * @param listener A <code>LogListener</code> object to register; the
-	 *        <code>LogListener</code> object is used to receive <code>LogEntry</code>
-	 *        objects.
-	 * @see LogListener
-	 * @see LogEntry
-	 * @see LogListener#logged(LogEntry)
-	 */
-	public void addLogListener(LogListener listener);
+    /**
+     * Subscribes to <code>LogEntry</code> objects.
+     * 
+     * <p>
+     * This method registers a <code>LogListener</code> object with the Log
+     * Reader Service. The <code>LogListener.logged(LogEntry)</code> method
+     * will be called for each <code>LogEntry</code> object placed into the
+     * log.
+     * 
+     * <p>
+     * When a bundle which registers a <code>LogListener</code> object is
+     * stopped or otherwise releases the Log Reader Service, the Log Reader
+     * Service must remove all of the bundle's listeners.
+     * 
+     * <p>
+     * If this Log Reader Service's list of listeners already contains a
+     * listener <code>l</code> such that <code>(l==listener)</code>,
this
+     * method does nothing.
+     * 
+     * @param listener A <code>LogListener</code> object to register; the
+     * <code>LogListener</code> object is used to receive
+     * <code>LogEntry</code> objects.
+     * @see LogListener
+     * @see LogEntry
+     * @see LogListener#logged(LogEntry)
+     */
+    public void addLogListener(LogListener listener);
 
-	/**
-	 * Unsubscribes to <code>LogEntry</code> objects.
-	 * 
-	 * <p>
-	 * This method unregisters a <code>LogListener</code> object from the Log
-	 * Reader Service.
-	 * 
-	 * <p>
-	 * If <code>listener</code> is not contained in this Log Reader Service's list
-	 * of listeners, this method does nothing.
-	 * 
-	 * @param listener A <code>LogListener</code> object to unregister.
-	 * @see LogListener
-	 */
-	public void removeLogListener(LogListener listener);
+    /**
+     * Unsubscribes to <code>LogEntry</code> objects.
+     * 
+     * <p>
+     * This method unregisters a <code>LogListener</code> object from the Log
+     * Reader Service.
+     * 
+     * <p>
+     * If <code>listener</code> is not contained in this Log Reader Service's
+     * list of listeners, this method does nothing.
+     * 
+     * @param listener A <code>LogListener</code> object to unregister.
+     * @see LogListener
+     */
+    public void removeLogListener(LogListener listener);
 
-	/**
-	 * Returns an <code>Enumeration</code> of all <code>LogEntry</code>
objects in
-	 * the log.
-	 * 
-	 * <p>
-	 * Each element of the enumeration is a <code>LogEntry</code> object, ordered
-	 * with the most recent entry first. Whether the enumeration is of all
-	 * <code>LogEntry</code> objects since the Log Service was started or some
-	 * recent past is implementation-specific. Also implementation-specific is
-	 * whether informational and debug <code>LogEntry</code> objects are included
-	 * in the enumeration.
-	 * @return An <code>Enumeration</code> of all <code>LogEntry</code>
objects in
-	 * the log.
-	 */
-	public Enumeration getLog();
+    /**
+     * Returns an <code>Enumeration</code> of all <code>LogEntry</code>
+     * objects in the log.
+     * 
+     * <p>
+     * Each element of the enumeration is a <code>LogEntry</code> object,
+     * ordered with the most recent entry first. Whether the enumeration is of
+     * all <code>LogEntry</code> objects since the Log Service was started or
+     * some recent past is implementation-specific. Also implementation-specific
+     * is whether informational and debug <code>LogEntry</code> objects are
+     * included in the enumeration.
+     * 
+     * @return An <code>Enumeration</code> of all <code>LogEntry</code>
+     * objects in the log.
+     */
+    public Enumeration getLog();
 }

Modified: incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogService.java?view=diff&rev=529623&r1=529622&r2=529623
==============================================================================
--- incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogService.java (original)
+++ incubator/felix/trunk/ipojo/src/main/java/org/osgi/service/log/LogService.java Tue Apr
17 07:31:35 2007
@@ -1,19 +1,21 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogService.java,v
1.9 2006/06/16 16:31:49 hargrave Exp $
- *
+ * $Header:
+ * /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogService.java,v
+ * 1.9 2006/06/16 16:31:49 hargrave Exp $
+ * 
  * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
- *
- * 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
- *
+ * 
+ * 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.
+ * 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.osgi.service.log;
 
@@ -23,8 +25,8 @@
  * Provides methods for bundles to write messages to the log.
  * 
  * <p>
- * <code>LogService</code> methods are provided to log messages; optionally with
a
- * <code>ServiceReference</code> object or an exception.
+ * <code>LogService</code> methods are provided to log messages; optionally
+ * with a <code>ServiceReference</code> object or an exception.
  * 
  * <p>
  * Bundles must log messages in the OSGi environment with a severity level
@@ -39,118 +41,121 @@
  * @version $Revision: 1.9 $
  */
 public interface LogService {
-	/**
-	 * An error message (Value 1).
-	 * 
-	 * <p>
-	 * This log entry indicates the bundle or service may not be functional.
-	 */
-	public static final int	LOG_ERROR	= 1;
-	/**
-	 * A warning message (Value 2).
-	 * 
-	 * <p>
-	 * This log entry indicates a bundle or service is still functioning but may
-	 * experience problems in the future because of the warning condition.
-	 */
-	public static final int	LOG_WARNING	= 2;
-	/**
-	 * An informational message (Value 3).
-	 * 
-	 * <p>
-	 * This log entry may be the result of any change in the bundle or service
-	 * and does not indicate a problem.
-	 */
-	public static final int	LOG_INFO	= 3;
-	/**
-	 * A debugging message (Value 4).
-	 * 
-	 * <p>
-	 * This log entry is used for problem determination and may be irrelevant to
-	 * anyone but the bundle developer.
-	 */
-	public static final int	LOG_DEBUG	= 4;
-
-	/**
-	 * Logs a message.
-	 * 
-	 * <p>
-	 * The <code>ServiceReference</code> field and the <code>Throwable</code>
field
-	 * of the <code>LogEntry</code> object will be set to <code>null</code>.
-	 * 
-	 * @param level The severity of the message. This should be one of the
-	 *        defined log levels but may be any integer that is interpreted in a
-	 *        user defined way.
-	 * @param message Human readable string describing the condition or
-	 *        <code>null</code>.
-	 * @see #LOG_ERROR
-	 * @see #LOG_WARNING
-	 * @see #LOG_INFO
-	 * @see #LOG_DEBUG
-	 */
-	public void log(int level, String message);
-
-	/**
-	 * Logs a message with an exception.
-	 * 
-	 * <p>
-	 * The <code>ServiceReference</code> field of the <code>LogEntry</code>
object
-	 * will be set to <code>null</code>.
-	 * 
-	 * @param level The severity of the message. This should be one of the
-	 *        defined log levels but may be any integer that is interpreted in a
-	 *        user defined way.
-	 * @param message The human readable string describing the condition or
-	 *        <code>null</code>.
-	 * @param exception The exception that reflects the condition or
-	 *        <code>null</code>.
-	 * @see #LOG_ERROR
-	 * @see #LOG_WARNING
-	 * @see #LOG_INFO
-	 * @see #LOG_DEBUG
-	 */
-	public void log(int level, String message, Throwable exception);
-
-	/**
-	 * Logs a message associated with a specific <code>ServiceReference</code>
-	 * object.
-	 * 
-	 * <p>
-	 * The <code>Throwable</code> field of the <code>LogEntry</code>
will be set to
-	 * <code>null</code>.
-	 * 
-	 * @param sr The <code>ServiceReference</code> object of the service that this
-	 *        message is associated with or <code>null</code>.
-	 * @param level The severity of the message. This should be one of the
-	 *        defined log levels but may be any integer that is interpreted in a
-	 *        user defined way.
-	 * @param message Human readable string describing the condition or
-	 *        <code>null</code>.
-	 * @see #LOG_ERROR
-	 * @see #LOG_WARNING
-	 * @see #LOG_INFO
-	 * @see #LOG_DEBUG
-	 */
-	public void log(ServiceReference sr, int level, String message);
-
-	/**
-	 * Logs a message with an exception associated and a
-	 * <code>ServiceReference</code> object.
-	 * 
-	 * @param sr The <code>ServiceReference</code> object of the service that this
-	 *        message is associated with.
-	 * @param level The severity of the message. This should be one of the
-	 *        defined log levels but may be any integer that is interpreted in a
-	 *        user defined way.
-	 * @param message Human readable string describing the condition or
-	 *        <code>null</code>.
-	 * @param exception The exception that reflects the condition or
-	 *        <code>null</code>.
-	 * @see #LOG_ERROR
-	 * @see #LOG_WARNING
-	 * @see #LOG_INFO
-	 * @see #LOG_DEBUG
-	 */
-	public void log(ServiceReference sr, int level, String message,
-			Throwable exception);
+    /**
+     * An error message (Value 1).
+     * 
+     * <p>
+     * This log entry indicates the bundle or service may not be functional.
+     */
+    public static final int LOG_ERROR = 1;
+
+    /**
+     * A warning message (Value 2).
+     * 
+     * <p>
+     * This log entry indicates a bundle or service is still functioning but may
+     * experience problems in the future because of the warning condition.
+     */
+    public static final int LOG_WARNING = 2;
+
+    /**
+     * An informational message (Value 3).
+     * 
+     * <p>
+     * This log entry may be the result of any change in the bundle or service
+     * and does not indicate a problem.
+     */
+    public static final int LOG_INFO = 3;
+
+    /**
+     * A debugging message (Value 4).
+     * 
+     * <p>
+     * This log entry is used for problem determination and may be irrelevant to
+     * anyone but the bundle developer.
+     */
+    public static final int LOG_DEBUG = 4;
+
+    /**
+     * Logs a message.
+     * 
+     * <p>
+     * The <code>ServiceReference</code> field and the <code>Throwable</code>
+     * field of the <code>LogEntry</code> object will be set to
+     * <code>null</code>.
+     * 
+     * @param level The severity of the message. This should be one of the
+     * defined log levels but may be any integer that is interpreted in a user
+     * defined way.
+     * @param message Human readable string describing the condition or
+     * <code>null</code>.
+     * @see #LOG_ERROR
+     * @see #LOG_WARNING
+     * @see #LOG_INFO
+     * @see #LOG_DEBUG
+     */
+    public void log(int level, String message);
+
+    /**
+     * Logs a message with an exception.
+     * 
+     * <p>
+     * The <code>ServiceReference</code> field of the <code>LogEntry</code>
+     * object will be set to <code>null</code>.
+     * 
+     * @param level The severity of the message. This should be one of the
+     * defined log levels but may be any integer that is interpreted in a user
+     * defined way.
+     * @param message The human readable string describing the condition or
+     * <code>null</code>.
+     * @param exception The exception that reflects the condition or
+     * <code>null</code>.
+     * @see #LOG_ERROR
+     * @see #LOG_WARNING
+     * @see #LOG_INFO
+     * @see #LOG_DEBUG
+     */
+    public void log(int level, String message, Throwable exception);
+
+    /**
+     * Logs a message associated with a specific <code>ServiceReference</code>
+     * object.
+     * 
+     * <p>
+     * The <code>Throwable</code> field of the <code>LogEntry</code>
will be
+     * set to <code>null</code>.
+     * 
+     * @param sr The <code>ServiceReference</code> object of the service that
+     * this message is associated with or <code>null</code>.
+     * @param level The severity of the message. This should be one of the
+     * defined log levels but may be any integer that is interpreted in a user
+     * defined way.
+     * @param message Human readable string describing the condition or
+     * <code>null</code>.
+     * @see #LOG_ERROR
+     * @see #LOG_WARNING
+     * @see #LOG_INFO
+     * @see #LOG_DEBUG
+     */
+    public void log(ServiceReference sr, int level, String message);
+
+    /**
+     * Logs a message with an exception associated and a
+     * <code>ServiceReference</code> object.
+     * 
+     * @param sr The <code>ServiceReference</code> object of the service that
+     * this message is associated with.
+     * @param level The severity of the message. This should be one of the
+     * defined log levels but may be any integer that is interpreted in a user
+     * defined way.
+     * @param message Human readable string describing the condition or
+     * <code>null</code>.
+     * @param exception The exception that reflects the condition or
+     * <code>null</code>.
+     * @see #LOG_ERROR
+     * @see #LOG_WARNING
+     * @see #LOG_INFO
+     * @see #LOG_DEBUG
+     */
+    public void log(ServiceReference sr, int level, String message, Throwable exception);
 }

Modified: incubator/felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/pom.xml?view=diff&rev=529623&r1=529622&r2=529623
==============================================================================
--- incubator/felix/trunk/pom.xml (original)
+++ incubator/felix/trunk/pom.xml Tue Apr 17 07:31:35 2007
@@ -140,6 +140,9 @@
         <module>scr</module>
         <module>configadmin</module>
         <module>metatype</module>
+        
+        <module>ipojo</module>
+        <module>ipojo.metadata</module>
       </modules>
     </profile>
     
@@ -172,8 +175,7 @@
 
         <!--    <module>tools/mangen</module> -->
 
-        <module>ipojo</module>
-        <module>ipojo.metadata</module>
+
       </modules>
     </profile>
 



Mime
View raw message