You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/08/08 08:44:34 UTC
svn commit: r983356 - in /servicemix/smx4/nmr/trunk/jbi:
deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/
runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/
Author: ffang
Date: Sun Aug 8 06:44:33 2010
New Revision: 983356
URL: http://svn.apache.org/viewvc?rev=983356&view=rev
Log:
[SMX4NMR-218]enable configure jbi component through system property
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryInstaller.java
servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java?rev=983356&r1=983355&r2=983356&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java Sun Aug 8 06:44:33 2010
@@ -58,7 +58,7 @@ public class ComponentInstaller extends
public ComponentInstaller(Deployer deployer, Descriptor descriptor, File jbiArtifact, boolean autoStart) throws Exception {
super(deployer, descriptor, jbiArtifact, autoStart);
- this.installRoot = new File(System.getProperty("karaf.base"), "data/jbi/" + getName() + "/install");
+ this.installRoot = new File(System.getProperty("karaf.base"), System.getProperty("jbi.cache", "data/jbi/") + getName() + "/install");
this.installRoot.mkdirs();
this.installationContext = new InstallationContextImpl(descriptor.getComponent(),
deployer.getEnvironment());
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=983356&r1=983355&r2=983356&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Sun Aug 8 06:44:33 2010
@@ -120,8 +120,7 @@ public class Deployer implements Synchro
private Storage storage;
public Deployer() throws JBIException {
- // TODO: control that using properties
- jbiRootDir = new File(System.getProperty("karaf.base"), "data/jbi");
+ jbiRootDir = new File(System.getProperty("karaf.base"), System.getProperty("jbi.cache", "data/jbi/"));
jbiRootDir.mkdirs();
// Create listener registry
listenerRegistry = new ListenerRegistryImpl();
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java?rev=983356&r1=983355&r2=983356&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ServiceAssemblyInstaller.java Sun Aug 8 06:44:33 2010
@@ -45,7 +45,7 @@ public class ServiceAssemblyInstaller ex
public ServiceAssemblyInstaller(Deployer deployer, Descriptor descriptor, File jbiArtifact, boolean autoStart) {
super(deployer, descriptor, jbiArtifact, autoStart);
- this.installRoot = new File(System.getProperty("karaf.base"), "data/jbi/" + getName() + "/install");
+ this.installRoot = new File(System.getProperty("karaf.base"), System.getProperty("jbi.cache", "data/jbi/") + getName() + "/install");
this.installRoot.mkdirs();
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryInstaller.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryInstaller.java?rev=983356&r1=983355&r2=983356&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryInstaller.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryInstaller.java Sun Aug 8 06:44:33 2010
@@ -39,7 +39,7 @@ public class SharedLibraryInstaller exte
public SharedLibraryInstaller(Deployer deployer, Descriptor descriptor, File jbiArtifact, boolean autoStart) {
super(deployer, descriptor, jbiArtifact, autoStart);
- installRoot = new File(System.getProperty("karaf.base"), "data/jbi/" + getName() + "/install");
+ installRoot = new File(System.getProperty("karaf.base"), System.getProperty("jbi.cache", "data/jbi/") + getName() + "/install");
installRoot.mkdirs();
}
Modified: servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java?rev=983356&r1=983355&r2=983356&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/ComponentContextImpl.java Sun Aug 8 06:44:33 2010
@@ -76,9 +76,9 @@ public class ComponentContextImpl extend
this.componentRegistry.getNmr().getEndpointRegistry().register(componentEndpoint, properties);
this.dc = new DeliveryChannelImpl(this, componentEndpoint.getChannel(), queue);
this.name = (String) properties.get(ComponentRegistry.NAME);
- this.workspaceRoot = new File(System.getProperty("karaf.base"), "data/jbi/" + name + "/workspace");
+ this.workspaceRoot = new File(System.getProperty("karaf.base"), System.getProperty("jbi.cache", "data/jbi/") + name + "/workspace");
this.workspaceRoot.mkdirs();
- this.installRoot = new File(System.getProperty("karaf.base"), "data/jbi/" + name + "/install");
+ this.installRoot = new File(System.getProperty("karaf.base"), System.getProperty("jbi.cache", "data/jbi/") + name + "/install");
this.installRoot.mkdirs();
}