Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 0eedd87e authored by Guillaume Thomazon's avatar Guillaume Thomazon
Browse files

PROXY-168 : Clean the trunk 

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@56187 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
parent 53569dc6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 223 additions and 380 deletions
gazelle-proxy-common-war/pom.xml
+ 3
− 2
View file @ 0eedd87e
<?xml version='1.0' encoding='UTF-8'?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.ihe.gazelle.proxy</groupId>
<artifactId>gazelle-proxy</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
gazelle-proxy-common-war/src/main/webapp/messages/commonDownload.xhtml
+ 0
− 42
View file @ 0eedd87e
......@@ -88,23 +88,6 @@
render="insertForm,displayButtons"
rendered="#{messageBean.isDisplayInText()}"/>
</s:span>
<s:span id="tlsSpan"
rendered="#{messageBean.isTlsMessage()}">
<a4j:commandButton value="Decode" styleClass="gzl-btn btn-xs" execute="@this"
action="#{messageBean.decodeTls(messageBean.message.connection.id,messageBean.messageIndex)}"
render="insertForm,tlsSpan"
rendered="#{messageBean.isDisplayDecoded() == false}"/>
<s:span rendered="#{messageBean.isDisplayDecoded()}">
<a4j:commandButton value="Display text" styleClass="gzl-btn btn-xs" execute="@this"
action="#{messageBean.setDisplayInText(true)}"
render="insertForm,tlsSpan"
rendered="#{!messageBean.isDisplayInText()}"/>
<a4j:commandButton value="Mask text" styleClass="gzl-btn btn-xs" execute="@this"
action="#{messageBean.setDisplayInText(false)}"
render="insertForm,tlsSpan"
rendered="#{messageBean.isDisplayInText()}"/>
</s:span>
</s:span>
</h:form>
</p>
</h:panelGroup>
......@@ -140,31 +123,6 @@
highlight="beanshell"/>
</s:div>
</div>
<s:div id="div1" styleClass="well"
rendered="#{messageBean.displayDecoded and messageBean.isTlsMessage()}">
<gdk:insert content="#{messageBean.prettyFormat(messageBean.getDecodedContent())}"
highlight="xml"/>
</s:div>
<h:panelGroup rendered="#{messageBean.displayDecoded and messageBean.isTlsMessage()}">
<h:commandLink action="#{messageBean.downloadDecodedFile(false)}" execute="@this"
target="_blank" title="Download decoded file">
<span class="gzl-icon-download"/>
</h:commandLink>
<h:commandLink action="#{messageBean.downloadDecodedFile(true)}" execute="@this"
target="_blank" title="View decoded file">
<span class="gzl-icon-search"/>
</h:commandLink>
<h:commandLink action="#{messageBean.validateDecoded()}" target="_blank" execute="@this"
title="#{messages['net.ihe.gazelle.proxy.ValidateUsingEVSClient']}">
<span class="gzl-icon-checked"/>
</h:commandLink>
</h:panelGroup>
<s:div id="div2" styleClass="well"
rendered="#{messageBean.isDisplayInText() and messageBean.isTlsMessage()}">
<h:outputText value="#{messageBean.message.getDumpInText(messageBean.decodedContent)}"
escape="false"/>
</s:div>
</h:panelGroup>
</h:form>
......
gazelle-proxy-common-war/src/main/webapp/messages/commonProperties.xhtml
+ 0
− 38
View file @ 0eedd87e
......@@ -48,44 +48,6 @@
</span>
</ui:decorate>
<h:panelGroup
rendered="#{messageBean.message.decodedId != null and (messageBean.message.decodedId &gt; 0)}">
<ui:decorate template="/layout/display/_data_list_item.xhtml">
<ui:define name="label">Decoded PermanentLink</ui:define>
<span class="gzl-never-wrap">
<h:outputLink
value="#{messageBean.displayURLOfDecodedPage()}?id=#{messageBean.message.decodedId}">
<h:outputText
value="#{messageBean.displayURLOfDecodedPage()}?id=#{messageBean.message.decodedId}"/>
</h:outputLink>
<button type="button" id="copy-button-decoded-#{messageBean.message.decodedId}"
class="gzl-btn"
data-clipboard-text="#{messageBean.displayURLOfDecodedPage()}?id=#{messageBean.message.decodedId}"
title="Copy to clipboard">
<span class="fa fa-clipboard" style="margin-right:0;"/>
</button>
<script>
var clip = new Clipboard('#copy-button-decoded-#{messageBean.message.decodedId}');
clip.on('success', function (e) {
e.clearSelection();
e.trigger.setAttribute('class', 'gzl-btn tooltipped tooltipped-s');
e.trigger.setAttribute('aria-label', 'Copied!');
});
clip.on('error', function (e) {
e.clearSelection();
e.trigger.setAttribute('class', 'gzl-btn tooltipped tooltipped-s');
e.trigger.setAttribute('aria-label', 'Failed! It may be not supported by your browser');
});
jq162('#copy-button-decoded-#{messageBean.message.decodedId}').bind('mouseleave', function (e) {
e.currentTarget.setAttribute('class', 'gzl-btn');
e.currentTarget.removeAttribute('aria-label');
});
</script>
</span>
</ui:decorate>
</h:panelGroup>
<ui:decorate template="/layout/display/_data_list_item.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.ID']}</ui:define>
......
gazelle-proxy-common-war/src/main/webapp/messages/tlsHl7.xhtml deleted 100644 → 0
+ 0
− 15
View file @ 53569dc6
<ui:composition
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns="http://www.w3.org/1999/xhtml" template="/layout/template.xhtml">
<ui:define name="body">
<h2>#{messages['net.ihe.gazelle.proxy.RawMessage']} TLS</h2>
#{messageBean.retrieveMessage("TLSHL7")}
#{messageBean.intResult()}
<h:form id="propertiesFrom">
<ui:include src="commonProperties.xhtml"></ui:include>
</h:form>
<ui:include src="commonDownload.xhtml"></ui:include>
</ui:define>
</ui:composition>
gazelle-proxy-common-war/src/main/webapp/messages/tlsRaw.xhtml deleted 100644 → 0
+ 0
− 15
View file @ 53569dc6
<ui:composition
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns="http://www.w3.org/1999/xhtml" template="/layout/template.xhtml">
<ui:define name="body">
<h2>#{messages['net.ihe.gazelle.proxy.RawMessage']} TLS</h2>
#{messageBean.retrieveMessage("TLSRAW")}
#{messageBean.intResult()}
<h:form>
<ui:include src="commonProperties.xhtml"></ui:include>
</h:form>
<ui:include src="commonDownload.xhtml"></ui:include>
</ui:define>
</ui:composition>
gazelle-proxy-ear/pom.xml
+ 3
− 2
View file @ 0eedd87e
<?xml version='1.0' encoding='UTF-8'?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.ihe.gazelle.proxy</groupId>
<artifactId>gazelle-proxy</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>gazelle-proxy-ear</artifactId>
......
gazelle-proxy-ejb/pom.xml
+ 3
− 2
View file @ 0eedd87e
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>net.ihe.gazelle.proxy</groupId>
<artifactId>gazelle-proxy</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/action/ChannelsLazyView.java
+ 6
− 8
View file @ 0eedd87e
package net.ihe.gazelle.proxy.action;
import java.io.Serializable;
import java.util.List;
import javax.annotation.PostConstruct;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import net.ihe.gazelle.proxy.netty.Proxy;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
......@@ -17,6 +9,12 @@ import org.primefaces.event.SelectEvent;
import org.primefaces.event.UnselectEvent;
import org.primefaces.model.LazyDataModel;
import javax.annotation.PostConstruct;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import java.io.Serializable;
import java.util.List;
@Name("channelsLazyView")
@Scope(ScopeType.PAGE)
public class ChannelsLazyView extends LazyDataModel<Proxy<?, ?>> implements Serializable {
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/action/LazyProxyListDataModel.java
+ 4
− 6
View file @ 0eedd87e
package net.ihe.gazelle.proxy.action;
import net.ihe.gazelle.proxy.netty.Proxy;
import org.primefaces.model.LazyDataModel;
import org.primefaces.model.SortOrder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import net.ihe.gazelle.proxy.netty.Proxy;
import org.primefaces.model.LazyDataModel;
import org.primefaces.model.SortOrder;
public class LazyProxyListDataModel extends LazyDataModel<Proxy<?, ?>> {
/**
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/action/LazySorter.java
+ 2
− 3
View file @ 0eedd87e
package net.ihe.gazelle.proxy.action;
import java.util.Comparator;
import net.ihe.gazelle.proxy.netty.Proxy;
import org.primefaces.model.SortOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Comparator;
public class LazySorter implements Comparator<Proxy<?, ?>> {
private static Logger log = LoggerFactory.getLogger(LazySorter.class);
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/action/ProxyCSPPoliciesPreferences.java
+ 2
− 3
View file @ 0eedd87e
package net.ihe.gazelle.proxy.action;
import java.util.Map;
import net.ihe.gazelle.common.servletfilter.CSPPoliciesPreferences;
import org.kohsuke.MetaInfServices;
import java.util.Map;
@MetaInfServices(CSPPoliciesPreferences.class)
public class ProxyCSPPoliciesPreferences implements CSPPoliciesPreferences {
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/action/ProxyLocal.java
+ 3
− 4
View file @ 0eedd87e
package net.ihe.gazelle.proxy.action;
import java.util.List;
import javax.ejb.Local;
import net.ihe.gazelle.proxy.netty.ConnectionConfig;
import net.ihe.gazelle.proxy.netty.Proxy;
import javax.ejb.Local;
import java.util.List;
@Local
public interface ProxyLocal {
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/action/ProxyPreferenceProvider.java
+ 2
− 3
View file @ 0eedd87e
package net.ihe.gazelle.proxy.action;
import java.util.Date;
import net.ihe.gazelle.preferences.PreferenceProvider;
import net.ihe.gazelle.proxy.admin.model.ApplicationConfiguration;
import org.jboss.seam.contexts.Contexts;
import org.kohsuke.MetaInfServices;
import java.util.Date;
@MetaInfServices(PreferenceProvider.class)
public class ProxyPreferenceProvider implements PreferenceProvider {
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStep.java
+ 181
− 193
View file @ 0eedd87e
package net.ihe.gazelle.proxy.dao;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import net.ihe.gazelle.hql.HQLQueryBuilder;
import net.ihe.gazelle.hql.HQLRestriction;
import net.ihe.gazelle.hql.restrictions.HQLRestrictions;
......@@ -18,24 +7,53 @@ import net.ihe.gazelle.proxy.model.message.AbstractMessage;
import net.ihe.gazelle.proxy.model.tm.Configuration;
import net.ihe.gazelle.proxy.model.tm.Step;
import net.ihe.gazelle.proxy.model.tm.TestInstance;
import org.apache.commons.lang.StringEscapeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.Timestamp;
import java.util.*;
public class MessageFilterStep<T extends AbstractMessage> implements MessageFilter<T> {
public static String NEW_LINE = "\r\n";
private static Logger log = LoggerFactory.getLogger(MessageFilterStep.class);
public Date startDate = null;
public Date endDate = null;
public Date lastModifDate = null;
private Step step;
private boolean filterPathReceiver = true;
private boolean filterPathFrom = true;
private boolean filterDates = true;
private boolean filterPersoDate = false;
public Date startDate = null;
public Date endDate = null;
public Date lastModifDate = null;
public MessageFilterStep(Step step) {
super();
this.step = step;
}
public static void main(String[] args) {
Date lastModifDate = new Date();
log.info(lastModifDate.toString());
java.sql.Timestamp timeStampDate = new Timestamp(lastModifDate.getTime());
log.info(timeStampDate.toString());
Calendar cal = Calendar.getInstance();
cal.setTime(lastModifDate);
cal.set(Calendar.YEAR, (cal.get(Calendar.YEAR) + 1));
lastModifDate = cal.getTime();
timeStampDate = new Timestamp(lastModifDate.getTime());
log.info(lastModifDate.toString());
log.info(timeStampDate.toString());
cal.setTimeInMillis(lastModifDate.getTime());
cal.set(Calendar.YEAR, (cal.get(Calendar.YEAR) + 1));
lastModifDate = cal.getTime();
timeStampDate = new Timestamp(lastModifDate.getTime());
log.info(lastModifDate.toString());
log.info(timeStampDate.toString());
}
public Date getLastModifDate() {
return lastModifDate;
......@@ -69,11 +87,153 @@ public class MessageFilterStep<T extends AbstractMessage> implements MessageFilt
this.endDate = endDate;
}
public static String NEW_LINE = "\r\n";
private Crit getFilter() {
List<Crit> criterions = new ArrayList<Crit>();
if (step != null) {
TestInstance testInstance = step.getTestInstance();
public MessageFilterStep(Step step) {
super();
this.step = step;
List<Crit> critSenders = new ArrayList<Crit>();
List<Crit> critReceivers = new ArrayList<Crit>();
List<Configuration> senders = step.getSenders();
for (Configuration configuration : senders) {
critSenders.add(new CritSimple("fromIP", "from", configuration.getHost(), CritSimpleType.EQ));
}
List<Configuration> receivers = step.getReceivers();
for (Configuration configuration : receivers) {
critReceivers.add(new CritSimple("proxyPort", "proxy port", configuration.getProxyPort(),
CritSimpleType.EQ));
}
Set<Crit> paths = new HashSet<Crit>();
if (critSenders.size() == 0) {
filterPathFrom = false;
}
if (critReceivers.size() == 0) {
filterPathReceiver = false;
}
if (filterPathFrom && filterPathReceiver) {
for (Crit critSender : critSenders) {
for (Crit critReceiver : critReceivers) {
Crit path = new CritLogical(true, critSender, critReceiver);
paths.add(path);
}
}
} else if (filterPathReceiver) {
paths = new HashSet<MessageFilterStep.Crit>(critReceivers);
} else if (filterPathFrom) {
paths = new HashSet<MessageFilterStep.Crit>(critSenders);
}
if (paths.size() > 0) {
Crit[] pathsArray = paths.toArray(new Crit[paths.size()]);
Crit oneOfPath = new CritLogical(false, pathsArray);
criterions.add(oneOfPath);
}
if (filterPersoDate) {
if (endDate.before(startDate)) {
endDate = startDate;
}
criterions.add(new CritSimple("dateReceived", "date", startDate, CritSimpleType.GE));
criterions.add(new CritSimple("dateReceived", "date", endDate, CritSimpleType.LE));
}
if (filterDates) {
startDate = getStartDate(testInstance);
// For the moment the end date is the last modification of TI
endDate = getLastModifDate(testInstance);
criterions.add(new CritSimple("dateReceived", "date", startDate, CritSimpleType.GE));
criterions.add(new CritSimple("dateReceived", "date", endDate, CritSimpleType.LE));
}
}
Crit criterion = null;
if (criterions.size() > 0) {
Crit[] criterionsArray = criterions.toArray(new Crit[criterions.size()]);
criterion = new CritLogical(true, criterionsArray);
}
return criterion;
}
public void appendFilters(HQLQueryBuilder<T> criteria) {
Crit filter = getFilter();
if (filter != null) {
criteria.addRestriction(filter.getCriterion());
}
}
private Date getStartDate(TestInstance testInstance) {
return testInstance.getDate();
}
private Date getLastModifDate(TestInstance testInstance) {
setLastModifDate(startDate);
Date lastModifDate = getLastModifDate();
List<Step> steps = testInstance.getSteps();
int indexOf = steps.indexOf(step);
if (indexOf >= 0) {
lastModifDate = steps.get(indexOf).getDate();
}
if (lastModifDate == null || startDate.compareTo(lastModifDate) >= 0) {
setLastModifDate(startDate);
Calendar cal = new GregorianCalendar();
cal.setTime(getLastModifDate());
cal.set(Calendar.YEAR, (cal.get(Calendar.YEAR) + 1));
lastModifDate = cal.getTime();
}
return lastModifDate;
}
public boolean isFilterPathReceiver() {
return filterPathReceiver;
}
public void setFilterPathReceiver(boolean filterPathReceiver) {
this.filterPathReceiver = filterPathReceiver;
}
public boolean isFilterPathFrom() {
return filterPathFrom;
}
public void setFilterPathFrom(boolean filterPathFrom) {
this.filterPathFrom = filterPathFrom;
}
public boolean isFilterDates() {
return filterDates;
}
public void setFilterDates(boolean filterDates) {
this.filterDates = filterDates;
}
public String getStepFilter() {
Crit criterion = getFilter();
if (criterion != null) {
StringBuilder sb = new StringBuilder();
List<String> criterionString = criterion.asString();
for (String string : criterionString) {
sb.append(string).append(NEW_LINE);
}
String result = StringEscapeUtils.escapeHtml(sb.toString());
return "<pre>" + result + "</pre>";
} else {
return "None";
}
}
private static enum CritSimpleType {
EQ, GE, LE;
}
private static interface Crit {
......@@ -170,10 +330,6 @@ public class MessageFilterStep<T extends AbstractMessage> implements MessageFilt
}
private static enum CritSimpleType {
EQ, GE, LE;
}
private static class CritSimple implements Crit {
private String field;
......@@ -263,172 +419,4 @@ public class MessageFilterStep<T extends AbstractMessage> implements MessageFilt
}
private Crit getFilter() {
List<Crit> criterions = new ArrayList<Crit>();
if (step != null) {
TestInstance testInstance = step.getTestInstance();
List<Crit> critSenders = new ArrayList<Crit>();
List<Crit> critReceivers = new ArrayList<Crit>();
List<Configuration> senders = step.getSenders();
for (Configuration configuration : senders) {
critSenders.add(new CritSimple("fromIP", "from", configuration.getHost(), CritSimpleType.EQ));
}
List<Configuration> receivers = step.getReceivers();
for (Configuration configuration : receivers) {
critReceivers.add(new CritSimple("proxyPort", "proxy port", configuration.getProxyPort(),
CritSimpleType.EQ));
}
Set<Crit> paths = new HashSet<Crit>();
if (critSenders.size() == 0) {
filterPathFrom = false;
}
if (critReceivers.size() == 0) {
filterPathReceiver = false;
}
if (filterPathFrom && filterPathReceiver) {
for (Crit critSender : critSenders) {
for (Crit critReceiver : critReceivers) {
Crit path = new CritLogical(true, critSender, critReceiver);
paths.add(path);
}
}
} else if (filterPathReceiver) {
paths = new HashSet<MessageFilterStep.Crit>(critReceivers);
} else if (filterPathFrom) {
paths = new HashSet<MessageFilterStep.Crit>(critSenders);
}
if (paths.size() > 0) {
Crit[] pathsArray = paths.toArray(new Crit[paths.size()]);
Crit oneOfPath = new CritLogical(false, pathsArray);
criterions.add(oneOfPath);
}
if (filterPersoDate) {
if (endDate.before(startDate)) {
endDate = startDate;
}
criterions.add(new CritSimple("dateReceived", "date", startDate, CritSimpleType.GE));
criterions.add(new CritSimple("dateReceived", "date", endDate, CritSimpleType.LE));
}
if (filterDates) {
startDate = getStartDate(testInstance);
// For the moment the end date is the last modification of TI
endDate = getLastModifDate(testInstance);
criterions.add(new CritSimple("dateReceived", "date", startDate, CritSimpleType.GE));
criterions.add(new CritSimple("dateReceived", "date", endDate, CritSimpleType.LE));
}
}
Crit criterion = null;
if (criterions.size() > 0) {
Crit[] criterionsArray = criterions.toArray(new Crit[criterions.size()]);
criterion = new CritLogical(true, criterionsArray);
}
return criterion;
}
public void appendFilters(HQLQueryBuilder<T> criteria) {
Crit filter = getFilter();
if (filter != null) {
criteria.addRestriction(filter.getCriterion());
}
}
private Date getStartDate(TestInstance testInstance) {
return testInstance.getDate();
}
private Date getLastModifDate(TestInstance testInstance) {
setLastModifDate(startDate);
Date lastModifDate = getLastModifDate();
List<Step> steps = testInstance.getSteps();
int indexOf = steps.indexOf(step);
if (indexOf >= 0) {
lastModifDate = steps.get(indexOf).getDate();
}
if (lastModifDate == null || startDate.compareTo(lastModifDate) >= 0) {
setLastModifDate(startDate);
Calendar cal = new GregorianCalendar();
cal.setTime(getLastModifDate());
cal.set(Calendar.YEAR, (cal.get(Calendar.YEAR) + 1));
lastModifDate = cal.getTime();
}
return lastModifDate;
}
public static void main(String[] args) {
Date lastModifDate = new Date();
log.info(lastModifDate.toString());
java.sql.Timestamp timeStampDate = new Timestamp(lastModifDate.getTime());
log.info(timeStampDate.toString());
Calendar cal = Calendar.getInstance();
cal.setTime(lastModifDate);
cal.set(Calendar.YEAR, (cal.get(Calendar.YEAR) + 1));
lastModifDate = cal.getTime();
timeStampDate = new Timestamp(lastModifDate.getTime());
log.info(lastModifDate.toString());
log.info(timeStampDate.toString());
cal.setTimeInMillis(lastModifDate.getTime());
cal.set(Calendar.YEAR, (cal.get(Calendar.YEAR) + 1));
lastModifDate = cal.getTime();
timeStampDate = new Timestamp(lastModifDate.getTime());
log.info(lastModifDate.toString());
log.info(timeStampDate.toString());
}
public boolean isFilterPathReceiver() {
return filterPathReceiver;
}
public void setFilterPathReceiver(boolean filterPathReceiver) {
this.filterPathReceiver = filterPathReceiver;
}
public boolean isFilterPathFrom() {
return filterPathFrom;
}
public void setFilterPathFrom(boolean filterPathFrom) {
this.filterPathFrom = filterPathFrom;
}
public boolean isFilterDates() {
return filterDates;
}
public void setFilterDates(boolean filterDates) {
this.filterDates = filterDates;
}
public String getStepFilter() {
Crit criterion = getFilter();
if (criterion != null) {
StringBuilder sb = new StringBuilder();
List<String> criterionString = criterion.asString();
for (String string : criterionString) {
sb.append(string).append(NEW_LINE);
}
String result = StringEscapeUtils.escapeHtml(sb.toString());
return "<pre>" + result + "</pre>";
} else {
return "None";
}
}
}
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/dao/ProxyEntityManagerProvider.java
+ 0
− 1
View file @ 0eedd87e
package net.ihe.gazelle.proxy.dao;
import net.ihe.gazelle.hql.providers.detached.AbstractEntityManagerProvider;
import org.jboss.seam.contexts.Contexts;
public class ProxyEntityManagerProvider extends AbstractEntityManagerProvider {
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/gui/MessagesStepBean.java
+ 0
− 6
View file @ 0eedd87e
......@@ -139,9 +139,6 @@ public class MessagesStepBean implements Serializable {
if (message instanceof RawMessage) {
viewId = "/messages/raw.xhtml";
}
if (message instanceof TlsRawMessage) {
viewId = "/messages/tlsRaw.xhtml";
}
if (message instanceof DicomMessage) {
viewId = "/messages/dicom.xhtml";
}
......@@ -166,9 +163,6 @@ public class MessagesStepBean implements Serializable {
if (message instanceof RawMessage) {
return "/messages/raw.seam?id=" + message.getId();
}
if (message instanceof TlsRawMessage) {
return "/messages/tlsRaw.seam?id=" + message.getId();
}
if (message instanceof DicomMessage) {
return "/messages/dicom.seam?id=" + message.getId();
}
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/model/tm/Configuration.java
+ 3
− 8
View file @ 0eedd87e
package net.ihe.gazelle.proxy.model.tm;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import net.ihe.gazelle.proxy.netty.ChannelType;
import javax.persistence.*;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import net.ihe.gazelle.proxy.netty.ChannelType;
@Entity
@Table(name = "tm_configuration", schema = "public")
@XmlAccessorType(XmlAccessType.NONE)
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/model/tm/Step.java
+ 4
− 13
View file @ 0eedd87e
package net.ihe.gazelle.proxy.model.tm;
import java.util.Date;
import java.util.List;
import net.ihe.gazelle.proxy.model.message.AbstractMessage;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import net.ihe.gazelle.proxy.model.message.AbstractMessage;
import java.util.Date;
import java.util.List;
@Entity
@Table(name = "tm_step", schema = "public")
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java
+ 3
− 11
View file @ 0eedd87e
package net.ihe.gazelle.proxy.model.tm;
import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.persistence.*;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import java.util.Date;
import java.util.List;
@Entity
@Table(name = "tm_testInstance", schema = "public")
......
gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java
+ 4
− 5
View file @ 0eedd87e
package net.ihe.gazelle.proxy.ws;
import java.util.List;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import net.ihe.gazelle.hql.providers.detached.HibernateFailure;
import net.ihe.gazelle.proxy.model.tm.Configuration;
import net.ihe.gazelle.proxy.model.tm.TestInstance;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import java.util.List;
public interface IProxyForTM {
@WebMethod
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment