Author: alexsmirnov
Date: 2009-12-01 19:22:35 -0500 (Tue, 01 Dec 2009)
New Revision: 16029
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java
Log:
Resolve attributes in Maven plugin.
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-12-01
16:28:32 UTC (rev 16028)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/CdkEntityResolver.java 2009-12-02
00:22:35 UTC (rev 16029)
@@ -194,8 +194,11 @@
// Standard attributes. Look for them in the satndard place via
// project classloader.
String path = systemIdInternal.substring(URN_ATTRIBUTES.length());
+ // Project classpath has precedence
InputStream inputStream =
getContext().getLoader().getResourceAsStream(ATTRIBUTES_PREFIX + path);
-
+ if (null == inputStream) {
+ inputStream =
getClass().getClassLoader().getResourceAsStream(ATTRIBUTES_PREFIX + path);
+ }
if (null != inputStream) {
entity = new InputSource(inputStream);
}
Show replies by date