Skip to content

Commit

Permalink
Move library.xpl to make URI unique
Browse files Browse the repository at this point in the history
  • Loading branch information
ndw committed Jun 8, 2015
1 parent d840d0f commit 63e36c3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
@@ -1,4 +1,4 @@
version=1.1.2
version=1.1.3
snapshot=

group=com.xmlcalabash
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/xmlcalabash/extensions/SendMail.java
Expand Up @@ -77,6 +77,7 @@ public class SendMail extends DefaultStep {
public final static QName em_content = new QName("em", NS_EMAIL, "content");

private static final String library_xpl = "http://xmlcalabash.com/extension/steps/send-mail.xpl";
private static final String library_url = "/com/xmlcalabash/extensions/send-mail/library.xpl";

private ReadablePipe source = null;
private WritablePipe result = null;
Expand Down Expand Up @@ -387,14 +388,14 @@ public Source resolve(String href, String base) throws TransformerException {
URI baseURI = new URI(base);
URI xpl = baseURI.resolve(href);
if (library_xpl.equals(xpl.toASCIIString())) {
URL url = SendMail.class.getResource("/library.xpl");
URL url = SendMail.class.getResource(library_url);
logger.debug("Reading library.xpl for cx:send-mail from " + url);
InputStream s = SendMail.class.getResourceAsStream("/library.xpl");
InputStream s = SendMail.class.getResourceAsStream(library_url);
if (s != null) {
SAXSource source = new SAXSource(new InputSource(s));
return source;
} else {
logger.info("Failed to read library.xpl for cx:send-mail");
logger.info("Failed to read " + library_url + " for cx:send-mail");
}
}
} catch (URISyntaxException e) {
Expand Down
File renamed without changes.

0 comments on commit 63e36c3

Please sign in to comment.