You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2009/10/05 12:32:12 UTC
svn commit: r821744 - in /felix/trunk/scr/src:
main/java/org/apache/felix/scr/impl/
main/java/org/apache/felix/scr/impl/manager/
test/java/org/apache/felix/scr/integration/
Author: fmeschbe
Date: Mon Oct 5 10:32:12 2009
New Revision: 821744
URL: http://svn.apache.org/viewvc?rev=821744&view=rev
Log:
FELIX-1674 fix typo (thanks Dims for reporting)
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java?rev=821744&r1=821743&r2=821744&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java Mon Oct 5 10:32:12 2009
@@ -387,7 +387,7 @@
case Component.STATE_ENABLED:
return "enabled";
case Component.STATE_UNSATISFIED:
- return "unsatisifed";
+ return "unsatisfied";
case Component.STATE_ACTIVATING:
return "activating";
case Component.STATE_ACTIVE:
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=821744&r1=821743&r2=821744&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java Mon Oct 5 10:32:12 2009
@@ -790,7 +790,7 @@
/**
* Activates this component if satisfied. If any of the dependencies is
- * not met, the component is not activated and remains unsatisifed.
+ * not met, the component is not activated and remains unsatisfied.
* <p>
* This method schedules the activation for asynchronous execution.
*/
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java?rev=821744&r1=821743&r2=821744&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java Mon Oct 5 10:32:12 2009
@@ -466,7 +466,7 @@
{
log(
LogService.LOG_ERROR,
- "Updating the service references caused at least on reference to become unsatisifed, deactivating component",
+ "Updating the service references caused at least on reference to become unsatisfied, deactivating component",
null );
return false;
}
Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java?rev=821744&r1=821743&r2=821744&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentConfigurationTest.java Mon Oct 5 10:32:12 2009
@@ -135,7 +135,7 @@
deleteConfig( pid1 );
delay();
- // expect a single unsatisifed component
+ // expect a single unsatisfied component
final Component[] configsDeleted = findComponentsByName( factoryPid );
TestCase.assertNotNull( configsDeleted );
TestCase.assertEquals( 1, configsDeleted.length );