Merge pull request #34 from nicolasmoreau/master

Merge production version with dev

portal.ejb/src/main/java/org/vamdc/portal/cookie/DisclaimerCookie.java

@@ -23,7 +23,7 @@ public Boolean getValue(){
 	}
 
 	public void setValue(Boolean value){
-		// 5 years expire date
-		cookieHelper.setCookie(this.name, value.toString(), 5 * 365 * 24 * 60 * 60 );
+		// 1 year expire date
+		cookieHelper.setCookie(this.name, value.toString(),  365 * 24 * 60 * 60 );
 	}
 }

portal.ejb/src/main/java/org/vamdc/portal/session/preview/PreviewManager.java

@@ -175,14 +175,18 @@ public void completeEvent(){
 		this.completeEventCalled=true;
 		List<HttpHeadResponse> results = getNodes();
 		int numActive=0;
+		String nodeId = null;
+
 
 		for (HttpHeadResponse node:results){
-
-			if (node.isOk() && node.getStatus()==Response.OK)
+			if (node.isOk() && node.getStatus()==Response.OK){
+				nodeId = node.getIvoaID();
 				numActive++;
+			}
 		}
 
 		if (numActive==1){
+			consumers.updateNodeIds(nodeId);
 			consumers.getQueries().put(results.get(0).getFullQueryURL(), true);
 		}
 

portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/formsTree/WithReactionCollisionForm.java

@@ -124,7 +124,7 @@ public void setMaxElementCount(Integer maxElementCount) {
 
 	@Override
 	public String getTitle() {
-		return "Please, enter the number of targets and colliders you wish to add";
+		return "Please, enter the number of reactants and products you wish to add";
 	}
 
 	@Override

portal.ejb/src/main/java/org/vamdc/portal/session/security/Register.java

@@ -1,5 +1,8 @@
 package org.vamdc.portal.session.security;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.In;
@@ -38,7 +41,11 @@ public void register()
 			new RunAsOperation() {
 				@Override
 				public void execute() {
-					if (!identityManager.userExists(username)){
+					if(password.equals(verifyPassword) == false){
+						throw new IdentityManagementException("Password and verification password do not match.");
+					}else if(isValidEmail() == false){
+						throw new IdentityManagementException("Email address is not valid.");						
+					} else if (!identityManager.userExists(username)){
 						identityManager.createUser(username,password);
 					}else{
 						throw new IdentityManagementException("User #{register.username} already exists!");
@@ -53,6 +60,12 @@ public void execute() {
 		}
 
 	}
+
+	private Boolean isValidEmail(){
+		Pattern pattern = Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE);
+		Matcher matcher = pattern.matcher(email);
+		return matcher.find();
+	}
 
 
 	@Observer(JpaIdentityStore.EVENT_PRE_PERSIST_USER)

portal.war/src/main/webapp/layout/header.xhtml

@@ -3,17 +3,11 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:s="http://jboss.com/products/seam/taglib"
-	xmlns:a4j="http://richfaces.org/a4j"
 	xmlns:rich="http://richfaces.org/rich" styleClass="my-toolbar-header">
 
 	<h:panelGrid columns="2">
 		<h:outputLink value="http://vamdc.eu">
 			<h:graphicImage value="/img/vamdc_logo.png" alt="vamdc_logo"/>
 		</h:outputLink>
-		<a4j:region selfRendered="true">
-			<h:messages id="messages" globalOnly="true" styleClass="message"
-				errorClass="errormsg" infoClass="infomsg" warnClass="warnmsg"
-				rendered="#{showGlobalMessages != 'false'}" />
-		</a4j:region>
 	</h:panelGrid>
 </s:span>

portal.war/src/main/webapp/layout/template.xhtml

@@ -23,7 +23,11 @@ window.history.forward();
 	<div class="header"><ui:include src="header.xhtml"/></div>
 	<ui:include src="menu.xhtml"/>
 	<div class="body">
-
+		<a:region selfRendered="true">
+			<h:messages id="messages" globalOnly="true" styleClass="message"
+				errorClass="errormsg" infoClass="infomsg" warnClass="warnmsg"
+				rendered="#{showGlobalMessages != 'false'}" />
+		</a:region>
 		<ui:insert name="body" />
 	</div>
 

portal.war/src/main/webapp/nodes.xhtml

@@ -10,7 +10,7 @@
 
 	<ui:define name="body">
 
-		<rich:dataTable id="queryListAll" value="#{nodes.nodes}" var="node">
+		<rich:dataTable id="queryListAll" value="#{nodes.nodes}" var="node" styleClass="nodesTable">
 			<f:facet name="header">
 				<rich:columnGroup>
 					<h:column>

portal.war/src/main/webapp/stylesheet/style.css

@@ -185,3 +185,7 @@
 	-moz-border-radius: 10px;
 	border-radius: 10px;
 }
+
+.nodesTable{
+	width : 90%;	
+}

portal.war/src/main/webapp/xhtml/disclaimer/disclaimerValidation.xhtml

@@ -8,9 +8,9 @@
 	xmlns:rich="http://richfaces.org/rich">
 
 		<p class="disclaimer">
-			You must accept the following disclaimer to use our services : 
+			You must accept the following disclaimer to use our services ( this will install a cookie in your web browser ) : 
 		</p>
-		<ui:include src="disclaimerText.xhtml"></ui:include>
+
 		<h:form class="disclaimer">
 			<!--   -->
 			 <input type="hidden" name="sourcePage" value="#{view.viewId}" />
@@ -20,4 +20,6 @@
 
 	   		<h:commandButton value="Submit" action="#{disclaimerForm.validate}" /> 
 		</h:form>
+
+		<ui:include src="disclaimerText.xhtml"></ui:include>
 </ui:composition>

portal.war/src/main/webapp/xhtml/query/formMenu.xhtml

@@ -49,7 +49,7 @@
 						action="#{query.addFormBranches}" />
 					<rich:menuItem value="Comments" reRender="formPanel"
 						action="#{query.addFormComments}" />
-					<!-- <rich:menuItem value="Asynchronous request" reRender="formPanel"
+					<!--<rich:menuItem value="Asynchronous request" reRender="formPanel"
 						action="#{query.addFormAsync}" />-->
 				</rich:dropDownMenu>