[jboss-svn-commits] JBoss Common SVN: r2556 - in jbossxb/trunk: src/main/java/org/jboss/xb/binding and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 20 10:53:50 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-09-20 10:53:50 -0400 (Thu, 20 Sep 2007)
New Revision: 2556
Removed:
jbossxb/trunk/src/test/java/org/jboss/test/test/
Modified:
jbossxb/trunk/.classpath
jbossxb/trunk/pom.xml
jbossxb/trunk/src/main/java/org/jboss/xb/binding/GenericValueContainer.java
Log:
Update mvn/eclipse settings for merged jbossxb/jbossxb-builder
Modified: jbossxb/trunk/.classpath
===================================================================
--- jbossxb/trunk/.classpath 2007-09-20 14:30:47 UTC (rev 2555)
+++ jbossxb/trunk/.classpath 2007-09-20 14:53:50 UTC (rev 2556)
@@ -6,14 +6,16 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.0.5/jaxb-api-2.0.5.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.0.GA/jboss-test-1.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta4/jboss-container-2.0.0.Beta4.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: jbossxb/trunk/pom.xml
===================================================================
--- jbossxb/trunk/pom.xml 2007-09-20 14:30:47 UTC (rev 2555)
+++ jbossxb/trunk/pom.xml 2007-09-20 14:53:50 UTC (rev 2556)
@@ -17,20 +17,7 @@
<build>
<finalName>jboss-xml-binding</finalName>
<plugins>
- <!-- define how we want compilation to take place
- here, we accept most of the defaults but say that we want the
- optimization flag set, and define the source and target to be 1.4,
- these setting will be inherited by child projects -->
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<!-- The tagBase property is needed during the release process so that the maven release plugin
@@ -73,6 +60,7 @@
</snapshots>
</repository>
</repositories>
+
<dependencies>
<dependency>
<groupId>jboss</groupId>
@@ -87,16 +75,23 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.0.4.GA</version>
+ <version>2.2.1.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.0.GA</version>
- <scope>test</scope>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-container</artifactId>
+ <version>2.0.0.Beta4</version>
+ <scope>compile</scope>
+ <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>apache-xerces</groupId>
@@ -111,16 +106,30 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.0.5</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.0.2</version>
- <scope>compile</scope>
- </dependency>
+
</dependencies>
</project>
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/GenericValueContainer.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/GenericValueContainer.java 2007-09-20 14:30:47 UTC (rev 2555)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/GenericValueContainer.java 2007-09-20 14:53:50 UTC (rev 2556)
@@ -119,8 +119,10 @@
{
try
{
- ctor = wrapperType.getConstructor(null);
- result = ctor.newInstance(null);
+ Class[] sig = null;
+ ctor = wrapperType.getConstructor(sig);
+ Object[] args = null;
+ result = ctor.newInstance(args);
RtUtil.set(result, arr, itemProp, null, false, null);
}
catch(NoSuchMethodException e)
More information about the jboss-svn-commits
mailing list