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/01/21 09:48:41 UTC
svn commit: r736265 - in /servicemix/smx4/kernel/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/etc/
gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/
management/src/...
Author: gnodet
Date: Wed Jan 21 00:48:41 2009
New Revision: 736265
URL: http://svn.apache.org/viewvc?rev=736265&view=rev
Log:
SMX4KNL-171: Include RFC0139 (JMX management of OSGi)
Removed:
servicemix/smx4/kernel/trunk/management/src/main/java/org/apache/servicemix/management/osgi/
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=736265&r1=736264&r2=736265&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Wed Jan 21 00:48:41 2009
@@ -218,6 +218,14 @@
<groupId>com.google.code.sshd</groupId>
<artifactId>sshd</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.osgi</groupId>
+ <artifactId>jmx-impl</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=736265&r1=736264&r2=736265&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Jan 21 00:48:41 2009
@@ -246,6 +246,22 @@
<include>com.google.code.sshd:sshd</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>org/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.osgi:jmx</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>com/oracle/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>com.oracle.osgi:jmx-impl</include>
+ </includes>
+ </dependencySet>
</dependencySets>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=736265&r1=736264&r2=736265&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Jan 21 00:48:41 2009
@@ -238,6 +238,22 @@
<include>com.google.code.sshd:sshd</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>org/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.osgi:jmx</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>com/oracle/osgi/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>com.oracle.osgi:jmx-impl</include>
+ </includes>
+ </dependencySet>
</dependencySets>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=736265&r1=736264&r2=736265&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Jan 21 00:48:41 2009
@@ -66,6 +66,8 @@
org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=30
org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.modules/${pom.version}/org.apache.servicemix.kernel.jaas.modules-${pom.version}.jar=30
com/google/code/sshd/sshd/${sshd.version}/sshd-${sshd.version}.jar=30
+org/osgi/jmx/${osgi.jmx.version}/jmx-${osgi.jmx.version}.jar=30
+com/oracle/osgi/jmx-impl/${osgi.jmx.version}/jmx-impl-${osgi.jmx.version}.jar=30
#
# Start console last
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties?rev=736265&r1=736264&r2=736265&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties Wed Jan 21 00:48:41 2009
@@ -66,6 +66,8 @@
org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=30
org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.modules/${pom.version}/org.apache.servicemix.kernel.jaas.modules-${pom.version}.jar=30
com/google/code/sshd/sshd/${sshd.version}/sshd-${sshd.version}.jar=30
+org/osgi/jmx/${osgi.jmx.version}/jmx-${osgi.jmx.version}.jar=30
+com/oracle/osgi/jmx-impl/${osgi.jmx.version}/jmx-impl-${osgi.jmx.version}.jar=30
#
# Start console last
Modified: servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml?rev=736265&r1=736264&r2=736265&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml (original)
+++ servicemix/smx4/kernel/trunk/management/src/main/resources/META-INF/spring/servicemix-management.xml Wed Jan 21 00:48:41 2009
@@ -69,31 +69,11 @@
<entry key="jmx.remote.authenticator" value-ref="jaasAuthenticator" />
</util:map>
- <!-- Simple authenticator -->
+ <!-- JAAS authenticator -->
<bean id="jaasAuthenticator" class="org.apache.servicemix.management.JaasAuthenticator">
<property name="realm" value="${jmxRealm}" />
</bean>
- <!-- OSGI framework helper -->
- <bean id="framework" class="org.apache.servicemix.management.osgi.OSGIFramework">
- </bean>
-
- <bean id="jmxAttributeSource" class="org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource"/>
-
- <!-- will create management interface using annotation metadata -->
- <bean id="assembler" class="org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler">
- <property name="attributeSource" ref="jmxAttributeSource"/>
- </bean>
-
- <bean id="exporter" class="org.springframework.jmx.export.MBeanExporter">
- <property name="beans">
- <map>
- <entry key="${frameworkName}" value-ref="framework"/>
- </map>
- </property>
- <property name="assembler" ref="assembler"/>
- </bean>
-
<!-- Property place holder -->
<osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.management">
<prop key="rmiRegistryPort">1099</prop>
@@ -102,7 +82,6 @@
<prop key="daemon">true</prop>
<prop key="threaded">true</prop>
<prop key="objectName">connector:name=rmi</prop>
- <prop key="frameworkName">org.osgi:name=Framework</prop>
</osgix:cm-properties>
<ctx:property-placeholder properties-ref="cmProps" />
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=736265&r1=736264&r2=736265&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Wed Jan 21 00:48:41 2009
@@ -103,6 +103,7 @@
<spring.version>2.5.6</spring.version>
<sshd.version>0.1</sshd.version>
<woodstox.version>3.2.7_1</woodstox.version>
+ <osgi.jmx.version>1.0-SNAPSHOT</osgi.jmx.version>
</properties>
<repositories>
@@ -120,7 +121,7 @@
</repository>
<!-- Apache snapshots -->
<repository>
- <id>apache.snapshots</id>
+ <id>apache-snapshots</id>
<name>Apache Snapshots Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
<releases>
@@ -659,6 +660,16 @@
<artifactId>sshd</artifactId>
<version>${sshd.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>jmx</artifactId>
+ <version>${osgi.jmx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.osgi</groupId>
+ <artifactId>jmx-impl</artifactId>
+ <version>${osgi.jmx.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>