You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2007/07/05 23:24:04 UTC
svn commit: r553638 - in /felix/trunk:
org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java
Author: pauls
Date: Thu Jul 5 14:24:02 2007
New Revision: 553638
URL: http://svn.apache.org/viewvc?view=rev&rev=553638
Log:
Adapt the maven-felix-plugin and the daemon to the framework api changes
Modified:
felix/trunk/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
felix/trunk/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java
Modified: felix/trunk/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
URL: http://svn.apache.org/viewvc/felix/trunk/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java?view=diff&rev=553638&r1=553637&r2=553638
==============================================================================
--- felix/trunk/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java (original)
+++ felix/trunk/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java Thu Jul 5 14:24:02 2007
@@ -74,9 +74,9 @@
{
this.layout = ( FelixLayout ) suppliedLayout;
}
-
- instance = new Felix();
+
configationProperties = readConfigProperties();
+ instance = new Felix(new MutablePropertyResolverImpl( new StringMap( configationProperties, false ) ), null );
}
@@ -96,13 +96,20 @@
}
// start up the instance using the loaded and possibly altered configuration
- instance.start( new MutablePropertyResolverImpl( new StringMap( configationProperties, false ) ), null );
+ try
+ {
+ instance.start();
+ }
+ catch (Exception ex)
+ {
+ // TODO: find out what to do
+ }
}
public void stop( String[] arg0 ) throws Exception
{
- instance.shutdown();
+ instance.stop();
}
Modified: felix/trunk/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java?view=diff&rev=553638&r1=553637&r2=553638
==============================================================================
--- felix/trunk/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java (original)
+++ felix/trunk/tools/maven2/maven-felix-plugin/src/main/java/org/apache/felix/tools/maven/felix/plugin/FelixRunMojo.java Thu Jul 5 14:24:02 2007
@@ -588,7 +588,7 @@
/**
* The felix container used to run the integration tests.
*/
- private Felix felixContainer = new Felix();
+ private Felix felixContainer;
public void execute() throws MojoExecutionException, MojoFailureException
@@ -662,11 +662,26 @@
// -------------------------------------------------------------------
MutablePropertyResolver resolver = new MutablePropertyResolverImpl(props);
- felixContainer.start( resolver, new ArrayList() );
+ felixContainer = new Felix(resolver, null);
+ try
+ {
+ felixContainer.start();
+ }
+ catch (Exception ex)
+ {
+ // TODO: find out what to do.
+ }
getLog().info( "-=============================-" );
getLog().info( "| Felix: successfully started |" );
getLog().info( "-=============================-" );
- felixContainer.shutdown();
+ try
+ {
+ felixContainer.stop();
+ }
+ catch (Exception ex)
+ {
+ // TODO: find out what to do.
+ }
getLog().info( "-==============================-" );
getLog().info( "| Felix: successfully shutdown |" );
getLog().info( "-==============================-" );