From 797930a0e4b0dbd7b2a251b138c3afe27bb8fd60 Mon Sep 17 00:00:00 2001
From: willemc <devnull@localhost>
Date: Sun, 6 Mar 2011 22:27:43 +0100
Subject: [PATCH] set names and fixed user id bug

---
 vasc-backend-jpa/pom.xml                              |  2 ++
 vasc-backend-ldap/pom.xml                             |  3 ++-
 vasc-core/pom.xml                                     |  2 ++
 .../vasc/impl/entry/SetParameterBackendListener.java  |  3 +++
 .../idcanet/vasc/impl/x4o/SetParameterElement.java    | 11 ++++-------
 vasc-ejb3/pom.xml                                     |  2 ++
 vasc-frontend-swing/pom.xml                           |  2 ++
 vasc-frontend-swt/pom.xml                             |  2 ++
 vasc-frontend-web-jsf/pom.xml                         |  2 ++
 9 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/vasc-backend-jpa/pom.xml b/vasc-backend-jpa/pom.xml
index edb5f5f..d82ee35 100644
--- a/vasc-backend-jpa/pom.xml
+++ b/vasc-backend-jpa/pom.xml
@@ -8,6 +8,8 @@
   <groupId>com.idcanet.vasc</groupId>
   <artifactId>vasc-backend-jpa</artifactId>
   <version>0.3.3-SNAPSHOT</version>
+  <name>vasc-backend-jpa</name>
+  <description>vasc-backend-jpa</description>
   <dependencies>
   	<dependency>
 		<groupId>com.idcanet.vasc</groupId>
diff --git a/vasc-backend-ldap/pom.xml b/vasc-backend-ldap/pom.xml
index 32e00d8..6701812 100644
--- a/vasc-backend-ldap/pom.xml
+++ b/vasc-backend-ldap/pom.xml
@@ -8,7 +8,8 @@
   <groupId>com.idcanet.vasc</groupId>
   <artifactId>vasc-backend-ldap</artifactId>
   <version>0.3.3-SNAPSHOT</version>
-  
+  <name>vasc-backend-ldap</name>
+  <description>vasc-backend-ldap</description>
   <dependencies>
   	<dependency>
 		<groupId>com.idcanet.vasc</groupId>
diff --git a/vasc-core/pom.xml b/vasc-core/pom.xml
index dd70e88..178c23b 100644
--- a/vasc-core/pom.xml
+++ b/vasc-core/pom.xml
@@ -8,6 +8,8 @@
   <groupId>com.idcanet.vasc</groupId>
   <artifactId>vasc-core</artifactId>
   <version>0.3.3-SNAPSHOT</version>
+  <name>vasc-core</name>
+  <description>vasc-core</description>
   <dependencies>
       <dependency>
 		<groupId>com.idcanet.x4o</groupId>
diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/SetParameterBackendListener.java b/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/SetParameterBackendListener.java
index ec660c6..64f2dd2 100644
--- a/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/SetParameterBackendListener.java
+++ b/vasc-core/src/main/java/com/idcanet/vasc/impl/entry/SetParameterBackendListener.java
@@ -50,6 +50,9 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene
 				if (value==null) {
 					value="id";
 				}
+				if (value.isEmpty()) {
+					value="id";
+				}
 				if ("id".equals(value)) {
 					if ("int".equals(type)) {
 						state.setDataParameter(name, userId.intValue());
diff --git a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SetParameterElement.java b/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SetParameterElement.java
index f1c2899..b579901 100644
--- a/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SetParameterElement.java
+++ b/vasc-core/src/main/java/com/idcanet/vasc/impl/x4o/SetParameterElement.java
@@ -28,15 +28,12 @@ package com.idcanet.vasc.impl.x4o;
 
 import java.util.logging.Logger;
 
-import com.idcanet.vasc.core.VascController;
 import com.idcanet.vasc.core.VascEntry;
-
 import com.idcanet.x4o.element.AbstractElement;
 import com.idcanet.x4o.element.ElementException;
 
-
 /**
- * 
+ * Handles the diffent EntryParameter xml tags
  * 
  * @author Willem Cazander
  * @version 1.0 Mar 24, 2009
@@ -54,19 +51,19 @@ public class SetParameterElement extends AbstractElement {
 		String value = getAttributes().get("value");
 		String type = getAttributes().get("type");
 		VascEntry entry = (VascEntry)getParent().getElementObject();
-		VascController cont = VascParser.getVascController(getElementContext());
 		logger.fine("Setting parameter name: "+name+" value: "+value+" type: "+type);
 		
 		if ("setUserParameter".equals(getElementClass().getTag())) {
+			if (value==null) {
+				value="id"; // default to ids
+			}
 			entry.setEntryParameter(name, "userPara:"+type+":"+value);
 			return;
 		}
-		
 		if (type==null) {
 			entry.setEntryParameter(name, value);
 			return;
 		}
-		
 		if ("long".equalsIgnoreCase(type)) {
 			entry.setEntryParameter(name, new Long(value));
 			return;
diff --git a/vasc-ejb3/pom.xml b/vasc-ejb3/pom.xml
index 5b64229..dd513d4 100644
--- a/vasc-ejb3/pom.xml
+++ b/vasc-ejb3/pom.xml
@@ -8,6 +8,8 @@
   <groupId>com.idcanet.vasc</groupId>
   <artifactId>vasc-ejb3</artifactId>
   <version>0.3.3-SNAPSHOT</version>
+  <name>vasc-ejb3</name>
+  <description>vasc-ejb3</description>
   <dependencies>
   	<dependency>
 		<groupId>com.idcanet.vasc</groupId>
diff --git a/vasc-frontend-swing/pom.xml b/vasc-frontend-swing/pom.xml
index 3815262..7ee3a82 100644
--- a/vasc-frontend-swing/pom.xml
+++ b/vasc-frontend-swing/pom.xml
@@ -8,6 +8,8 @@
   <groupId>com.idcanet.vasc</groupId>
   <artifactId>vasc-frontend-swing</artifactId>
   <version>0.3.3-SNAPSHOT</version>
+  <name>vasc-frontend-swing</name>
+  <description>vasc-frontend-swing</description>
   <dependencies>
   	<dependency>
 		<groupId>com.idcanet.vasc</groupId>
diff --git a/vasc-frontend-swt/pom.xml b/vasc-frontend-swt/pom.xml
index 65bdf5e..ff56cb3 100644
--- a/vasc-frontend-swt/pom.xml
+++ b/vasc-frontend-swt/pom.xml
@@ -8,6 +8,8 @@
   <groupId>com.idcanet.vasc</groupId>
   <artifactId>vasc-frontend-swt</artifactId>
   <version>0.3.3-SNAPSHOT</version>
+  <name>vasc-frontend-swt</name>
+  <description>vasc-frontend-swt</description>
   <dependencies>
   	<dependency>
 		<groupId>com.idcanet.vasc</groupId>
diff --git a/vasc-frontend-web-jsf/pom.xml b/vasc-frontend-web-jsf/pom.xml
index 64ac8ce..68ac8db 100644
--- a/vasc-frontend-web-jsf/pom.xml
+++ b/vasc-frontend-web-jsf/pom.xml
@@ -8,6 +8,8 @@
   <groupId>com.idcanet.vasc</groupId>
   <artifactId>vasc-frontend-web-jsf</artifactId>
   <version>0.3.3-SNAPSHOT</version>
+  <name>vasc-frontend-web-jsf</name>
+  <description>vasc-frontend-web-jsf</description>
   <dependencies>
   	<dependency>
 		<groupId>com.idcanet.vasc</groupId>