You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/07/09 00:06:53 UTC
svn commit: r674996 - in /maven/sandbox/trunk/shared/maven-shared-model: ./
src/main/java/org/apache/maven/shared/model/
Author: sisbell
Date: Tue Jul 8 15:06:53 2008
New Revision: 674996
URL: http://svn.apache.org/viewvc?rev=674996&view=rev
Log:
JDK 1.5 compatible.
Modified:
maven/sandbox/trunk/shared/maven-shared-model/pom.xml
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
Modified: maven/sandbox/trunk/shared/maven-shared-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/pom.xml?rev=674996&r1=674995&r2=674996&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/pom.xml (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/pom.xml Tue Jul 8 15:06:53 2008
@@ -9,6 +9,16 @@
<name>maven-shared-model</name>
<dependencies>
<dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0-2</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java?rev=674996&r1=674995&r2=674996&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java Tue Jul 8 15:06:53 2008
@@ -13,11 +13,4 @@
super(message);
}
- public DataSourceException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DataSourceException(Throwable cause) {
- super(cause);
- }
}
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=674996&r1=674995&r2=674996&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java Tue Jul 8 15:06:53 2008
@@ -1,5 +1,6 @@
package org.apache.maven.shared.model;
+
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=674996&r1=674995&r2=674996&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java Tue Jul 8 15:06:53 2008
@@ -91,8 +91,9 @@
removedModelContainers.add(mcB);
} catch (DataSourceException e) {
System.out.println(modelDataSource.getEventHistory());
+ e.printStackTrace();
throw new IOException("Failed to join model containers: URI = " + uri
- + ", Factory = " + factory.getClass().getName(), e);
+ + ", Factory = " + factory.getClass().getName());
}
}
}
@@ -136,7 +137,8 @@
return domainModel;
} catch (IOException e) {
System.out.println(modelDataSource.getEventHistory());
- throw new IOException(e);
+ e.printStackTrace();
+ throw new IOException(e.getMessage());
}
}