[ajax4jsf-svn-commits] JBoss Ajax4JSF SVN: r99 - in trunk/cdk/generator/src/main: resources/META-INF/templates and 1 other directory.

[ajax4jsf-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-04-18 06:44:19 -0400 (Wed, 18 Apr 2007)
New Revision: 99

Modified:
   trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceConfigGeneratorBean.java
   trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java
   trunk/cdk/generator/src/main/resources/META-INF/templates/resources-config.vm
Log:
Leading '/' in package name handling fixed

Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceConfigGeneratorBean.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceConfigGeneratorBean.java	2007-04-18 10:17:34 UTC (rev 98)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourceConfigGeneratorBean.java	2007-04-18 10:44:19 UTC (rev 99)
@@ -49,6 +49,10 @@
 		this.contentType = contentType;
 	}
 	public String getClassName() {
+		if (DEFAULT_CLASS_NAME.equals(className)) {
+			return null;
+		}
+
 		return className;
 	}
 	public void setClassName(String className) {

Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java	2007-04-18 10:17:34 UTC (rev 98)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java	2007-04-18 10:44:19 UTC (rev 99)
@@ -84,15 +84,11 @@
 	
 	private String resolveResourcePath(String name, String packageName) {
 		if (name.contains("/")) {
-			String resolvedName = name;
+			String resolvedName;
 
 			if (!name.startsWith("/")) {
 				//need to resolve
 				StringBuffer normalizedName = new StringBuffer();
-				if (!packageName.startsWith("/")) {
-					normalizedName.append('/');
-				}
-
 				normalizedName.append(packageName.replace('.', '/'));
 				
 				if (!packageName.endsWith("/")) {
@@ -102,6 +98,12 @@
 				normalizedName.append(name);
 				
 				resolvedName = normalizedName.toString();
+			} else {
+				if (name.length() > 0) {
+					resolvedName = name.substring(1);
+				} else {
+					resolvedName = null;
+				}
 			}
 
 			return resolvedName;

Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/resources-config.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/resources-config.vm	2007-04-18 10:17:34 UTC (rev 98)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/resources-config.vm	2007-04-18 10:44:19 UTC (rev 99)
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resource-config>
-
 #foreach( $resource in ${resources})
-<resource class="${resource.className}">
-	<name>${resource.key}</name>
-	#if(! ${resource.className})
-	<path>${resource.path}</path>
+	#if(${resource.className})
+	<resource class="${resource.className}">
+		<name>${resource.key}</name>
+	</resource>
+	#else
+	<resource>
+		<name>${resource.key}</name>
+		<path>${resource.path}</path>
+	</resource>
 	#end
-</resource>
 #end
-
 </resource-config>