You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/09/07 13:38:38 UTC
svn commit: r812093 - in /servicemix/sandbox/karaf/nmr:
examples/interceptors/endpoint/ examples/interceptors/exchange/
jbi/deployer/src/main/resources/OSGI-INF/blueprint/
jbi/osgi/src/main/resources/OSGI-INF/blueprint/ nmr/management/
nmr/management/s...
Author: gnodet
Date: Mon Sep 7 11:38:38 2009
New Revision: 812093
URL: http://svn.apache.org/viewvc?rev=812093&view=rev
Log:
Fix nmr management layer and update some readme's
Modified:
servicemix/sandbox/karaf/nmr/examples/interceptors/endpoint/README.txt
servicemix/sandbox/karaf/nmr/examples/interceptors/exchange/README.txt
servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
servicemix/sandbox/karaf/nmr/nmr/management/pom.xml
servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java
Modified: servicemix/sandbox/karaf/nmr/examples/interceptors/endpoint/README.txt
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/examples/interceptors/endpoint/README.txt?rev=812093&r1=812092&r2=812093&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/examples/interceptors/endpoint/README.txt (original)
+++ servicemix/sandbox/karaf/nmr/examples/interceptors/endpoint/README.txt Mon Sep 7 11:38:38 2009
@@ -22,7 +22,7 @@
-------------------------------------
Launch the ServiceMix Kernel by running
- bin/servicemix
+ bin/karaf
in the root dir of this distribution.
run:
@@ -31,7 +31,7 @@
Deploy the example on ServiceMix 4:
- using the ServiceMix console:
- osgi/install -s mvn:org.apache.servicemix.nmr.examples.interceptors/endpoint/${version}/jar
+ osgi:install -s mvn:org.apache.servicemix.nmr.examples.interceptors/endpoint/${version}/jar
Once the bundle is installed it will capture and report to the servicemix
log the endpoint register and unregister events in the NMR.
@@ -39,7 +39,7 @@
Starting and Stopping the Listener:
- using the ServiceMix console:
- osgi/start BundleID
- osgi/stop BundleID
+ osgi:start BundleID
+ osgi:stop BundleID
Note: Upon installation the Listener will automatically be started.
Modified: servicemix/sandbox/karaf/nmr/examples/interceptors/exchange/README.txt
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/examples/interceptors/exchange/README.txt?rev=812093&r1=812092&r2=812093&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/examples/interceptors/exchange/README.txt (original)
+++ servicemix/sandbox/karaf/nmr/examples/interceptors/exchange/README.txt Mon Sep 7 11:38:38 2009
@@ -22,7 +22,7 @@
-------------------------------------
Launch the ServiceMix Kernel by running
- bin/servicemix
+ bin/karaf
in the root dir of this distribution.
run:
@@ -31,7 +31,7 @@
Deploy the example on ServiceMix 4:
- using the ServiceMix console:
- osgi/install -s mvn:org.apache.servicemix.nmr.examples.interceptors/exchange/${version}/jar
+ osgi:install -s mvn:org.apache.servicemix.nmr.examples.interceptors/exchange/${version}/jar
Once the bundle is installed it will capture and report to the servicemix
log the sent and delivered exchanges in the NMR.
@@ -39,7 +39,7 @@
Starting and Stopping the Listener:
- using the ServiceMix console:
- osgi/start BundleID
- osgi/stop BundleID
+ osgi:start BundleID
+ osgi:stop BundleID
Note: Upon installation the Listener will automatically be started.
Modified: servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml?rev=812093&r1=812092&r2=812093&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml (original)
+++ servicemix/sandbox/karaf/nmr/jbi/deployer/src/main/resources/OSGI-INF/blueprint/servicemix-jbi-deployer.xml Mon Sep 7 11:38:38 2009
@@ -26,8 +26,7 @@
<property name="autoStart" value="true" />
<property name="endpointListener" ref="endpointListener" />
<property name="environment" ref="environment" />
- <property name="namingStrategy" ref="namingStrategy" />
- <property name="managementAgent" ref="managementAgent" />
+ <property name="managementStrategy" ref="managementStrategy" />
<property name="preferencesService" ref="preferencesService" />
<property name="shutdownTimeout" value="${shutdownTimeout}" />
<property name="bundleContext" ref="blueprintBundleContext"/>
@@ -59,16 +58,10 @@
</service>
<!-- Utilities -->
- <bean id="namingStrategy" class="org.apache.servicemix.jbi.deployer.impl.DefaultNamingStrategy">
- <property name="jmxDomainName" value="org.apache.servicemix" />
- </bean>
- <bean id="managementAgent" class="org.apache.servicemix.jbi.deployer.impl.ManagementAgent" destroy-method="destroy">
- <property name="mbeanServer" ref="mbeanServer" />
- </bean>
+ <reference id="managementStrategy" interface="org.fusesource.commons.management.ManagementStrategy" />
<!-- Services -->
<bean id="adminService" class="org.apache.servicemix.jbi.deployer.impl.AdminService">
- <property name="namingStrategy" ref="namingStrategy" />
</bean>
<bean id="adminCommandsService" class="org.apache.servicemix.jbi.deployer.impl.AdminCommandsImpl" init-method="init" destroy-method="destroy">
<property name="deployer" ref="deployer" />
Modified: servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml?rev=812093&r1=812092&r2=812093&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml (original)
+++ servicemix/sandbox/karaf/nmr/jbi/osgi/src/main/resources/OSGI-INF/blueprint/servicemix-jbi.xml Mon Sep 7 11:38:38 2009
@@ -31,15 +31,12 @@
<bean id="componentRegistry" class="org.apache.servicemix.jbi.runtime.impl.ComponentRegistryImpl">
<property name="nmr" ref="nmrWrapper" />
<property name="documentRepository" ref="documentRepository" />
- <property name="managementContext" ref="managementContext" />
+ <property name="managementStrategy" ref="managementStrategy" />
<property name="environment" ref="environment" />
</bean>
<!-- Management context -->
- <bean id="managementContext" class="org.apache.servicemix.jbi.runtime.impl.ManagementContext">
- <property name="jmxDomainName" value="org.apache.servicemix" />
- <property name="environment" ref="environment" />
- </bean>
+ <reference id="managementStrategy" interface="org.fusesource.commons.management.ManagementStrategy" />
<!-- Environment -->
<bean id="environment" class="org.apache.servicemix.jbi.runtime.impl.EnvironmentImpl">
Modified: servicemix/sandbox/karaf/nmr/nmr/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/management/pom.xml?rev=812093&r1=812092&r2=812093&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/nmr/management/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/nmr/management/pom.xml Mon Sep 7 11:38:38 2009
@@ -94,9 +94,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ javax.management.loading,
+ *
+ </Import-Package>
<Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified: servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java?rev=812093&r1=812092&r2=812093&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java (original)
+++ servicemix/sandbox/karaf/nmr/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java Mon Sep 7 11:38:38 2009
@@ -69,7 +69,7 @@
}
/**
- * @see org.fusesource.commons.management.ManagementStrategy#getObjectName(java.lang.Object)
+ * @see org.fusesource.commons.management.ManagementStrategy#getManagedObjectName(java.lang.Object,java.lang.String,java.lang.Class)
*/
public <T> T getManagedObjectName(Object managableObject,
String customName,
@@ -82,7 +82,7 @@
}
/**
- * @see org.fusesource.commons.management.ManagementStrategy#manageNamedObject(java.lang.Object)
+ * @see org.fusesource.commons.management.ManagementStrategy#manageNamedObject(java.lang.Object,java.lang.Object)
*/
public void manageNamedObject(Object managedObject, Object preferredName) throws Exception {
managedObject = getTypeSpecificManagedObject(managedObject);
@@ -90,7 +90,7 @@
try {
register(managedObject, (ObjectName)preferredName);
} catch (Exception ex) {
- throw new JMException(ex.getMessage());
+ throw (JMException) new JMException(ex.getMessage()).initCause(ex);
}
}
}
@@ -113,7 +113,7 @@
}
/**
- * @see org.fusesource.commons.management.ManagementStrategy#isManaged(java.lang.Object)
+ * @see org.fusesource.commons.management.ManagementStrategy#isManaged(java.lang.Object,java.lang.Object)
*/
public boolean isManaged(Object managableObject, Object name) {
try {
@@ -129,7 +129,7 @@
}
/**
- * @see org.fusesource.commons.management.ManagementStrategy#createStatistic(java.lang.Object)
+ * @see org.fusesource.commons.management.ManagementStrategy#createStatistic(java.lang.String,java.lang.Object,UpdateMode)
*/
public Statistic createStatistic(String name, Object owner, UpdateMode updateMode) {
return updateMode == UpdateMode.COUNTER