SF.net SVN: mx4j:[2280] trunk/mx4j

[email protected] Mon, 28 Dec 2009 08:29:04 +0000
Newsgroups gmane.comp.java.mx4j.cvs
Message-ID <[email protected]>
Revision: 2280
          http://mx4j.svn.sourceforge.net/mx4j/?rev=2280&view=rev
Author:   altheengineer
Date:     2009-12-28 08:28:58 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
Fixed several tests in HttpAdapterXMLTest, added creation of RMI stubs for testing (unable to get IIOP stubs to generate at this time) and corrected setting system property for surefire.

Modified Paths:
--------------
    trunk/mx4j/jsr160/pom.xml
    trunk/mx4j/pom.xml
    trunk/mx4j/tools/src/test/java/test/mx4j/tools/adaptor/http/HttpAdaptorXMLTest.java

Modified: trunk/mx4j/jsr160/pom.xml
===================================================================
--- trunk/mx4j/jsr160/pom.xml	2009-12-26 15:32:23 UTC (rev 2279)
+++ trunk/mx4j/jsr160/pom.xml	2009-12-28 08:28:58 UTC (rev 2280)
@@ -34,7 +34,35 @@
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>rmic-maven-plugin</artifactId>
+              <executions>
+                <execution>
+                  <id>rmi compilation</id>
+                  <goals>
+                    <goal>rmic</goal>
+                  </goals>
+                  <configuration>
+                    <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                  </configuration>
+                </execution>
+                <execution>
+                  <id>rmi iiop compilation</id>
+                  <goals>
+                    <goal>rmic</goal>
+                  </goals>
+                  <configuration>
+                    <iiop>true</iiop>
+                    <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                    <includes>
+                      <include>**/rmi/*.class</include>
+                    </includes>
+                  </configuration>
+                </execution>
+			  </executions>
+		    </plugin>
+         </plugins>
     </build>
 
     <dependencies>

Modified: trunk/mx4j/pom.xml
===================================================================
--- trunk/mx4j/pom.xml	2009-12-26 15:32:23 UTC (rev 2279)
+++ trunk/mx4j/pom.xml	2009-12-28 08:28:58 UTC (rev 2280)
@@ -54,12 +54,12 @@
                     <configuration>
                         <jvm>${java.home}/bin/java</jvm>
                         <forkMode>always</forkMode>
-                        <properties>
+                        <systemProperties>
                           <property>
                              <name>java.protocol.handler.pkgs</name>
                              <value>mx4j.tools.remote</value>
                           </property>
-                       </properties>
+                       </systemProperties>
                     </configuration>
                 </plugin>
                 <plugin>

Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/adaptor/http/HttpAdaptorXMLTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/test/mx4j/tools/adaptor/http/HttpAdaptorXMLTest.java	2009-12-26 15:32:23 UTC (rev 2279)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/adaptor/http/HttpAdaptorXMLTest.java	2009-12-28 08:28:58 UTC (rev 2280)
@@ -423,14 +423,14 @@
       Reader stream = getReader(host, port, "invoke?objectname=Test:name=test1&operation=aMethod&type0=java.lang.String&value0=true");
       String controlMBean = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                             "<MBeanOperation>" +
-                            "<Operation objectname=\"Test:name=test1\" operation=\"invoke\" result=\"success\" return=\"true\" returnclass=\"java.lang.Boolean\"/>" +
+                            "<Operation objectname=\"Test:name=test1\" operation=\"invoke\" result=\"success\" return=\"true\" returnclass=\"java.lang.Boolean\" returnunescaped=\"false\"/>" +
                             "</MBeanOperation>";
       assertXMLEqual(new StringReader(controlMBean), stream);
       stream.close();
       stream = getReader(host, port, "invoke?objectname=Test:name=test1&operation=aMethod&type0=java.lang.String&value0=test");
       controlMBean = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                      "<MBeanOperation>" +
-                     "<Operation objectname=\"Test:name=test1\" operation=\"invoke\" result=\"success\" return=\"false\"  returnclass=\"java.lang.Boolean\"/>" +
+                     "<Operation objectname=\"Test:name=test1\" operation=\"invoke\" result=\"success\" return=\"false\"  returnclass=\"java.lang.Boolean\" returnunescaped=\"false\"/>" +
                      "</MBeanOperation>";
       assertXMLEqual(new StringReader(controlMBean), stream);
       stream.close();
@@ -587,7 +587,7 @@
                             "<Attribute availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Double\" strinit=\"true\" type=\"java.lang.Double\" value=\"0.0\"/>" +
                             "<Attribute availability=\"RW\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Str\" strinit=\"true\" type=\"java.lang.String\" value=\"t1\"/>" +
                             "<Attribute availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"True\" strinit=\"true\" type=\"boolean\"  value=\"true\"/>" +
-                            "<Constructor description=\"Constructor exposed for management\" name=\"HttpAdaptorXMLTest$TestClass\">" +
+                            "<Constructor description=\"Constructor exposed for management\" name=\"test.mx4j.tools.adaptor.http.HttpAdaptorXMLTest$TestClass\">" +
                             "<Parameter description=\"Constructor's parameter n. 1\" id=\"0\" name=\"param1\" strinit=\"true\" type=\"java.lang.String\"/>" +
                             "</Constructor>" +
                             "<Operation description=\"Operation exposed for management\" impact=\"unknown\" name=\"aMethod\" return=\"java.lang.Boolean\">" +
@@ -614,7 +614,7 @@
                      "<Attribute aggregation=\"map\" availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Map\" strinit=\"false\" type=\"java.util.Map\" value=\"{2=2, 1=1}\"/>" +
                      "<Attribute availability=\"RW\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Str\" strinit=\"true\" type=\"java.lang.String\" value=\"t3\"/>" +
                      "<Attribute aggregation=\"array\" availability=\"RW\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"StrArray\" strinit=\"false\" type=\"[Ljava.lang.String;\" value=\"" + test3.getStrArray().toString() + "\"/>" +
-                     "<Constructor description=\"Constructor exposed for management\" name=\"HttpAdaptorXMLTest$TestClass2\">" +
+                     "<Constructor description=\"Constructor exposed for management\" name=\"test.mx4j.tools.adaptor.http.HttpAdaptorXMLTest$TestClass2\">" +
                      "<Parameter description=\"Constructor&apos;s parameter n. 1\" id=\"0\" name=\"param1\" strinit=\"true\" type=\"java.lang.String\"/>" +
                      "</Constructor>" +
                      "</MBean>";
@@ -633,7 +633,7 @@
                         "<Attribute aggregation=\"collection\" availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"List\" strinit=\"false\" type=\"java.util.List\" value=\"[1, 2]\"/>" +
                         "<Attribute aggregation=\"map\" availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Map\" strinit=\"false\" type=\"java.util.Map\" value=\"{2=2, 1=1}\"/>" +
                         "<Attribute availability=\"RW\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Str\" strinit=\"true\" type=\"java.lang.String\" value=\"t3\"/>" +
-                        "<Constructor description=\"Constructor exposed for management\" name=\"HttpAdaptorXMLTest$TestClass2\">" +
+                        "<Constructor description=\"Constructor exposed for management\" name=\"test.mx4j.tools.adaptor.http.HttpAdaptorXMLTest$TestClass2\">" +
                         "<Parameter description=\"Constructor&apos;s parameter n. 1\" id=\"0\" name=\"param1\" strinit=\"true\" type=\"java.lang.String\"/>" +
                         "</Constructor>" +
                         "</MBean>";
@@ -650,7 +650,7 @@
       Reader stream = getReader(host, port, "mbean?objectname=Test:name=test1&attributes=false");
       String controlMBean = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                             "<MBean classname=\"test.mx4j.tools.adaptor.http.HttpAdaptorXMLTest$TestClass\" description=\"Manageable Bean\" objectname=\"Test:name=test1\">" +
-                            "<Constructor description=\"Constructor exposed for management\" name=\"HttpAdaptorXMLTest$TestClass\">" +
+                            "<Constructor description=\"Constructor exposed for management\" name=\"test.mx4j.tools.adaptor.http.HttpAdaptorXMLTest$TestClass\">" +
                             "<Parameter description=\"Constructor's parameter n. 1\" id=\"0\" name=\"param1\" strinit=\"true\" type=\"java.lang.String\"/>" +
                             "</Constructor>" +
                             "<Operation description=\"Operation exposed for management\" impact=\"unknown\" name=\"aMethod\" return=\"java.lang.Boolean\">" +
@@ -695,7 +695,7 @@
                      "<Attribute availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Double\" strinit=\"true\" type=\"java.lang.Double\" value=\"0.0\"/>" +
                      "<Attribute availability=\"RW\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Str\" strinit=\"true\" type=\"java.lang.String\" value=\"t1\"/>" +
                      "<Attribute availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"True\" strinit=\"true\" type=\"boolean\"  value=\"true\"/>" +
-                     "<Constructor description=\"Constructor exposed for management\" name=\"HttpAdaptorXMLTest$TestClass\">" +
+                     "<Constructor description=\"Constructor exposed for management\" name=\"test.mx4j.tools.adaptor.http.HttpAdaptorXMLTest$TestClass\">" +
                      "<Parameter description=\"Constructor's parameter n. 1\" id=\"0\" name=\"param1\" strinit=\"true\" type=\"java.lang.String\"/>" +
                      "</Constructor>" +
                      "<Notification description=\"test\" name=\"name\">" +
@@ -711,7 +711,7 @@
                      "<Attribute availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Double\" strinit=\"true\" type=\"java.lang.Double\" value=\"0.0\"/>" +
                      "<Attribute availability=\"RW\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"Str\" strinit=\"true\" type=\"java.lang.String\" value=\"t1\"/>" +
                      "<Attribute availability=\"RO\" description=\"Attribute exposed for management\" isnull=\"false\" name=\"True\" strinit=\"true\" type=\"boolean\"  value=\"true\"/>" +
-                     "<Constructor description=\"Constructor exposed for management\" name=\"HttpAdaptorXMLTest$TestClass\">" +
+                     "<Constructor description=\"Constructor exposed for management\" name=\"test.mx4j.tools.adaptor.http.HttpAdaptorXMLTest$TestClass\">" +
                      "<Parameter description=\"Constructor's parameter n. 1\" id=\"0\" name=\"param1\" strinit=\"true\" type=\"java.lang.String\"/>" +
                      "</Constructor>" +
                      "<Operation description=\"Operation exposed for management\" impact=\"unknown\" name=\"aMethod\" return=\"java.lang.Boolean\">" +


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev