Projet

Général

Profil

« Précédent | Suivant » 

Révision 8fd1d584

Ajouté par Remy Menard il y a plus de 11 ans

Version 2.0

  • All:
    - upgrades Apache CXF to 2.7.5
    - upgrades Apache ActiveMQ to 5.8.0
    - license LGPL-3 for client libraries
    - a few bugs fixed!
  • new DS and DSeTa applications:
    - use Apache CXF
    - use JMS to store events to publish
  • LaMBDa:
    - uses GaMMa for event mapping with OpenLayers
    - "trace" and "DS" services are fully functionnal
  • DiscoveryPHI:
    - uses YPSilon
    - access to the web interface of policy management is made by
    certificate
  • EpcisPHI:
    - adds the MasterData to the web interface of policy management
  • ETa:
    - retrieves the owner of MasterData in the attributes if missing from
    the extensions
  • EPCIS:
    - removes calls to old CXF classes to avoid compatibility problems
  • Installer:
    - installs and configures the new DS and DSeTa
    - adds GaMMa to LaMBDa
    - upgrades Apache Tomcat to 7.0.41 and mysql-connector to 5.1.25

Voir les différences:

DSeTa/DiscoveryPHI/src/main/webapp/index.jsp
<%@page import="fr.unicaen.iota.discovery.client.model.UserInfo"%>
<%@page import="fr.unicaen.iota.discovery.client.model.PartnerInfo"%>
<%@page import="fr.unicaen.iota.discovery.client.DsClient"%>
<%@page import="fr.unicaen.iota.ypsilon.client.model.UserInfoOut"%>
<%@page import="fr.unicaen.iota.utils.Constants"%>
<%@page import="fr.unicaen.iota.ypsilon.client.YPSilonClient"%>
<%@page import="fr.unicaen.iota.utils.SessionLoader"%>
<%@page import="com.sun.xacml.ctx.Result"%>
<%@page import="fr.unicaen.iota.utils.PEPRequester"%>
<%@page import="fr.unicaen.iota.xacml.conf.Configuration"%>
<%
String sessionId = (String) session.getAttribute("session-id");
String sid = (String) request.getParameter("sid");
String uid = (String) request.getParameter("uid");
if (sid != null) {
DsClient dsClient = new DsClient(Configuration.DS_ADDRESS);
String message = SessionLoader.loadSession(sid, dsClient, uid, session);
YPSilonClient ypsilonClient = new YPSilonClient(Constants.YPSILON_ADDRESS, Constants.PKS_FILENAME,
Constants.PKS_PASSWORD, Constants.TRUST_PKS_FILENAME, Constants.TRUST_PKS_PASSWORD);
String message = SessionLoader.loadSession(sid, ypsilonClient, uid, session);
if (!message.isEmpty()) {
request.setAttribute("message", message);
%>
......
<%@page import="fr.unicaen.iota.xacml.ihm.Module"%>
<%@page import="fr.unicaen.iota.utils.HTMLUtilities"%>
<%@page import="java.util.Date"%>
<%@page import="fr.unicaen.iota.auth.Partner"%>
<%@page import="fr.unicaen.iota.auth.User"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
......
<title>Policy Manager</title>
<script type="text/javascript" src="script/tree.js"></script>
<script type="text/javascript" src="script/requestDispatcher.js"></script>
<script type="text/javascript" src="script/jquery.js"></script>
<script type="text/javascript" src="script/jquery-min.js"></script>
<script type="text/javascript" src="script/jquery-ui.min.js"></script>
<link rel="stylesheet" type="text/css" href="style/jquery-ui.css" />
<link rel="stylesheet" type="text/css" href="style/style.css" />
......
<div class="treeTitle">&nbsp;</div>
<jsp:include page="dialogs.jsp" />
<%
PartnerInfo pInfo = (PartnerInfo) session.getAttribute("pInfo");
UserInfo uInfo = (UserInfo) session.getAttribute("uInfo");
Partner partner = new Partner(0, true, pInfo.getPartnerId(), new Date(), null, null, null);
User u = new User(0, partner, "", uInfo.getUserId(), null, new Date());
UserInfoOut uInfo = (UserInfoOut) session.getAttribute("uInfo");
User u = new User(uInfo.getUserID(), uInfo.getOwnerID());
if (PEPRequester.checkAccess(u, "superadmin") != Result.DECISION_PERMIT) {
%>
<jsp:include page="policyList.jsp" />
......
<%
return;
}
String userId = ((UserInfo) session.getAttribute("uInfo")).getUserId();
String partnerId = ((PartnerInfo) session.getAttribute("pInfo")).getPartnerId();
String userId = ((UserInfoOut) session.getAttribute("uInfo")).getUserID();
String ownerId = ((UserInfoOut) session.getAttribute("uInfo")).getOwnerID();
%>
<div class="account">
<div class="logout"><a href="RootAccountAuth?action=logout">[ logout ]</a></div>
<div class="logout"><a href="#" onclick="processPartnerUpdate()" >[ Update My Account ]</a></div>
<div class="logout"><a href="#" onclick="processOwnerUpdate()" >[ Update My Account ]</a></div>
<div class="logout"><a href="#" onclick="processUserCreate()" >[ Create User ]</a></div>
<div style="width : 300px;"><span>*</span> User: <span class="accountDetails"><%=userId%></span> / Partner profile: <span class="accountDetails"><%=partnerId%></span></div>
<div class="logout"><a href="#" onclick="processUserDelete()" >[ Delete User ]</a></div>
<div style="width : 300px;"><span>*</span> User: <span class="accountDetails"><%=userId%></span> / Owner profile: <span class="accountDetails"><%=ownerId%></span></div>
</div>
</body>
</html>

Formats disponibles : Unified diff