[jboss-svn-commits] JBoss Common SVN: r2692 - in jbossxb-builder/trunk: src/main/java/org/jboss/xb/builder/runtime and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: alesj
Date: 2007-12-24 10:47:24 -0500 (Mon, 24 Dec 2007)
New Revision: 2692

Modified:
   jbossxb-builder/trunk/pom.xml
   jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/runtime/ArrayWrapper.java
Log:
Pom update, ArrayWrapper fix for compatibility with JBoss Container project.

Modified: jbossxb-builder/trunk/pom.xml
===================================================================
--- jbossxb-builder/trunk/pom.xml	2007-12-21 16:34:25 UTC (rev 2691)
+++ jbossxb-builder/trunk/pom.xml	2007-12-24 15:47:24 UTC (rev 2692)
@@ -63,6 +63,13 @@
   </pluginRepositories>
   
   
+  <properties>
+    <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer>
+    <version.jboss.jbossxb>2.0.0.CR4</version.jboss.jbossxb>
+    <version.jboss.test>1.0.4.GA</version.jboss.test>
+    <version.sun.jaxb>2.0.5</version.sun.jaxb>
+  </properties>
+
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <finalName>jboss-xml-binding-builder</finalName>
@@ -143,19 +150,19 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-test</artifactId>
-      <version>1.0.4.GA</version>
+      <version>${version.jboss.test}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>sun-jaxb</groupId>
       <artifactId>jaxb-api</artifactId>
-      <version>2.0.5</version>
+      <version>${version.sun.jaxb}</version>
       <scope>compile</scope>
     </dependency> 
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-container</artifactId>
-      <version>2.0.0.Beta4</version>
+      <version>${version.jboss.microcontainer}</version>
       <scope>compile</scope>
       <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
       <exclusions>
@@ -168,7 +175,7 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jbossxb</artifactId>
-      <version>2.0.0.CR4</version>
+      <version>${version.jboss.jbossxb}</version>
     </dependency>
   </dependencies>  
 

Modified: jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/runtime/ArrayWrapper.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/runtime/ArrayWrapper.java	2007-12-21 16:34:25 UTC (rev 2691)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/runtime/ArrayWrapper.java	2007-12-24 15:47:24 UTC (rev 2692)
@@ -21,8 +21,8 @@
 */
 package org.jboss.xb.builder.runtime;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
-
 import javax.xml.namespace.QName;
 
 import org.jboss.reflect.spi.ArrayInfo;
@@ -150,14 +150,15 @@
     * @param propertyType the property type
     * @return the array
     */
-   public Object[] getArray(TypeInfo propertyType)
+   public Object getArray(TypeInfo propertyType)
    {
       ArrayInfo arrayInfo = (ArrayInfo) propertyType;
       try
       {
-         Object[] result = arrayInfo.newArrayInstance(elements.size());
-         for (int i = 0; i < result.length; ++i)
-            result[i] = elements.get(i);
+         Object result = arrayInfo.newArrayInstance(elements.size());
+         int length = Array.getLength(result);
+         for (int i = 0; i < length; ++i)
+            Array.set(result, i, elements.get(i));
          return result;
       }
       catch (Throwable t)