Add back in the old XML dependencies as they are required for a successful build of Trinidad
diff --git a/maven-faces-plugin/pom.xml b/maven-faces-plugin/pom.xml
index 4045202..f464c58 100644
--- a/maven-faces-plugin/pom.xml
+++ b/maven-faces-plugin/pom.xml
@@ -57,6 +57,28 @@
<artifactId>commons-digester</artifactId>
<version>1.8.1</version>
</dependency>
+ <dependency>
+ <groupId>saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>6.5.3</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0_rc2-dev</version>
+ </dependency>
</dependencies>
<build>
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
index c701fad..815301f 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,7 +25,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
import java.net.URL;
+
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -48,13 +50,16 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.XIncludeFilter;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
+
/**
* @version $Id$
* @requiresDependencyResolution compile
@@ -118,6 +123,8 @@
Transformer identity = transFactory.newTransformer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
identity.transform(new DOMSource(document), new StreamResult(out));
+ System.out.println("----------------------------------------");
+ System.out.println(out.toString());
InputStream mergedStream = new ByteArrayInputStream(out.toByteArray());
// expand all the xi:include elements
@@ -211,7 +218,7 @@
tmpFile.delete();
}
-
+
targetFile.setReadOnly();
getLog().info("Generated " + targetPath);
@@ -250,7 +257,7 @@
}
return param;
}
-
+
/**
* @parameter expression="${project}"
* @readonly
