geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r893592 - in /geronimo/sandbox/rex: org.apache.geronimo.blueprint.jmx.test/ org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/ org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blu...
Date Wed, 23 Dec 2009 18:46:42 GMT
Author: gawor
Date: Wed Dec 23 18:46:39 2009
New Revision: 893592

URL: http://svn.apache.org/viewvc?rev=893592&view=rev
Log:
fix test failure and ensure the tests are run with the right artifacts

Modified:
    geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/pom.xml
    geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
    geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java

Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/pom.xml?rev=893592&r1=893591&r2=893592&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/pom.xml (original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/pom.xml Wed Dec 23 18:46:39
2009
@@ -27,7 +27,7 @@
     <packaging>bundle</packaging>
     <name>Apache Geronimo Blueprint Jmx Test</name>
 
-	<dependencies>
+    <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -136,7 +136,7 @@
 	
 	<build>
         <plugins>
-			<plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -145,6 +145,19 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>

Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java?rev=893592&r1=893591&r2=893592&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
(original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
Wed Dec 23 18:46:39 2009
@@ -74,15 +74,14 @@
     {      
       
         System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Configuration");
-        return CoreOptions.options(CoreOptions.equinox(), CoreOptions.provision(
-                CoreOptions.mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin"),
-                CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api"),
-                CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-service"),
-                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("geronimo-blueprint"),
-                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.sample"),
-                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.jmx"),
-                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.jmx.impl")
-                )
+        return CoreOptions.options(CoreOptions.equinox(), 
+                CoreOptions.mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin").versionAsInProject(),
              
+                CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").versionAsInProject(),
+                CoreOptions.mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-service").versionAsInProject(),
+                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("geronimo-blueprint").versionAsInProject(),
+                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.sample").versionAsInProject(),
+                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.jmx").versionAsInProject(),
+                CoreOptions.mavenBundle().groupId("org.apache.geronimo.blueprint").artifactId("org.apache.geronimo.blueprint.jmx.impl").versionAsInProject()
                               
         );
     }  
     

Modified: geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java?rev=893592&r1=893591&r2=893592&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java
(original)
+++ geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java
Wed Dec 23 18:46:39 2009
@@ -340,7 +340,7 @@
     Item            VALUES_ITEM             = new Item(
                                                     VALUES,
                                                     "All the values",
-                                                    Item.arrayType(2, JmxConstants.BYTE_ARRAY_TYPE));
+                                                    Item.arrayType(1, JmxConstants.BYTE_ARRAY_TYPE));
     
 
     /**



Mime
View raw message