You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2010/10/07 11:30:22 UTC
svn commit: r1005382 - in /sling/whiteboard/fmeschbe/jmx-whiteboard: ./
src/main/java/org/apache/aries/ src/main/java/org/apache/aries/jmx/
src/main/java/org/apache/aries/jmx/whiteboard/
src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard...
Author: fmeschbe
Date: Thu Oct 7 09:30:21 2010
New Revision: 1005382
URL: http://svn.apache.org/viewvc?rev=1005382&view=rev
Log:
ARIES-430 Refactor into Aries package space
Added:
sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/
- copied from r1002524, sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/Activator.java
- copied, changed from r1005377, sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/Activator.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java
- copied, changed from r1005377, sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/JmxWhiteboardSupport.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java
- copied, changed from r1005377, sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/MBeanHolder.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java
- copied, changed from r1005378, sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanServerTest.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java
- copied, changed from r1005378, sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanTest.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/
- copied from r1005378, sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/helper/
Removed:
sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanServerTest.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanTest.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/helper/
Modified:
sling/whiteboard/fmeschbe/jmx-whiteboard/pom.xml
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClass.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClassMBean.java
sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestStandardMBean.java
Modified: sling/whiteboard/fmeschbe/jmx-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/pom.xml?rev=1005382&r1=1005381&r2=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/pom.xml (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/pom.xml Thu Oct 7 09:30:21 2010
@@ -20,11 +20,11 @@
<version>0.2-incubating</version>
</parent>
- <artifactId>org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard</artifactId>
+ <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
<packaging>bundle</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>Apache Sling Whiteboard support for JMX DynamicMBean services</name>
+ <name>Apache Aries Whiteboard support for JMX DynamicMBean services</name>
<description>
This bundle implements whiteboard pattern support for DynamicMBean
services registered with the OSGi service registry. Each DynamicMBean
@@ -33,9 +33,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/whiteboard/fmeschbe/jmx-whiteboard</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/fmeschbe/jmx-whiteboard</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/sling/fmeschbe/jmx-whiteboard</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/jmx/jmx-whiteboard</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/jmx/jmx-whiteboard</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-whiteboard</url>
</scm>
@@ -61,13 +61,13 @@
</bundle.file.name>
<aries.osgi.activator>
- org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.Activator
+ org.apache.aries.jmx.whiteboard.Activator
</aries.osgi.activator>
<aries.osgi.export.pkg>
!*
</aries.osgi.export.pkg>
<aries.osgi.private.pkg>
- org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard
+ org.apache.aries.jmx.whiteboard
</aries.osgi.private.pkg>
<aries.osgi.import.service>
javax.management.MBeanServer
@@ -115,12 +115,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Copied: sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/Activator.java (from r1005377, sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/Activator.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/Activator.java?p2=sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/Activator.java&p1=sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/Activator.java&r1=1005377&r2=1005382&rev=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/Activator.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/Activator.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard;
+package org.apache.aries.jmx.whiteboard;
import javax.management.MBeanServer;
Copied: sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java (from r1005377, sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/JmxWhiteboardSupport.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java?p2=sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java&p1=sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/JmxWhiteboardSupport.java&r1=1005377&r2=1005382&rev=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/JmxWhiteboardSupport.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/JmxWhiteboardSupport.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard;
+package org.apache.aries.jmx.whiteboard;
import java.util.ArrayList;
import java.util.Arrays;
Copied: sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java (from r1005377, sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/MBeanHolder.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java?p2=sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java&p1=sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/MBeanHolder.java&r1=1005377&r2=1005382&rev=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/MBeanHolder.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard;
+package org.apache.aries.jmx.whiteboard;
import java.util.IdentityHashMap;
import java.util.Map;
Copied: sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java (from r1005378, sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanServerTest.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java?p2=sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java&p1=sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanServerTest.java&r1=1005378&r2=1005382&rev=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanServerTest.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanServerTest.java Thu Oct 7 09:30:21 2010
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration;
+package org.apache.aries.jmx.whiteboard.integration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import junit.framework.TestCase;
-import org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper.IntegrationTestBase;
-import org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper.TestClass;
-import org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper.TestClassMBean;
+import org.apache.aries.jmx.whiteboard.integration.helper.IntegrationTestBase;
+import org.apache.aries.jmx.whiteboard.integration.helper.TestClass;
+import org.apache.aries.jmx.whiteboard.integration.helper.TestClassMBean;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
Copied: sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java (from r1005378, sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanTest.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java?p2=sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java&p1=sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanTest.java&r1=1005378&r2=1005382&rev=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/sling/whiteboard/fmeschbe/jmx/whiteboard/integration/MBeanTest.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration;
+package org.apache.aries.jmx.whiteboard.integration;
import javax.management.DynamicMBean;
import javax.management.MBeanServer;
@@ -24,10 +24,10 @@ import javax.management.ObjectName;
import junit.framework.TestCase;
-import org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper.IntegrationTestBase;
-import org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper.TestClass;
-import org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper.TestClassMBean;
-import org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper.TestStandardMBean;
+import org.apache.aries.jmx.whiteboard.integration.helper.IntegrationTestBase;
+import org.apache.aries.jmx.whiteboard.integration.helper.TestClass;
+import org.apache.aries.jmx.whiteboard.integration.helper.TestClassMBean;
+import org.apache.aries.jmx.whiteboard.integration.helper.TestStandardMBean;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
Modified: sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java?rev=1005382&r1=1005378&r2=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper;
+package org.apache.aries.jmx.whiteboard.integration.helper;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
Modified: sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java?rev=1005382&r1=1005378&r2=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper;
+package org.apache.aries.jmx.whiteboard.integration.helper;
import java.net.URL;
import java.util.HashMap;
Modified: sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClass.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClass.java?rev=1005382&r1=1005378&r2=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClass.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClass.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper;
+package org.apache.aries.jmx.whiteboard.integration.helper;
/**
* The <code>TestClass</code> is a simple class which will be registered as a
Modified: sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClassMBean.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClassMBean.java?rev=1005382&r1=1005378&r2=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClassMBean.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestClassMBean.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper;
+package org.apache.aries.jmx.whiteboard.integration.helper;
/**
* The <code>TestClassMBean</code> is the simple MBean interface for the
Modified: sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestStandardMBean.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestStandardMBean.java?rev=1005382&r1=1005378&r2=1005382&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestStandardMBean.java (original)
+++ sling/whiteboard/fmeschbe/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/TestStandardMBean.java Thu Oct 7 09:30:21 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.whiteboard.fmeschbe.jmx.whiteboard.integration.helper;
+package org.apache.aries.jmx.whiteboard.integration.helper;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;