Menu
▾
▴
tolven-cvs-commit — Tolven CVS Commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(141) |
Sep
(184) |
Oct
(159) |
Nov
(77) |
Dec
(114) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(212) |
Feb
(302) |
Mar
(323) |
Apr
(360) |
May
(302) |
Jun
(392) |
Jul
(299) |
Aug
(858) |
Sep
(499) |
Oct
(489) |
Nov
(324) |
Dec
(438) |
| 2008 |
Jan
(449) |
Feb
(388) |
Mar
(811) |
Apr
(583) |
May
(949) |
Jun
(1431) |
Jul
(943) |
Aug
(527) |
Sep
(576) |
Oct
(440) |
Nov
(1046) |
Dec
(658) |
| 2009 |
Jan
(259) |
Feb
(192) |
Mar
(495) |
Apr
(2322) |
May
(2023) |
Jun
(1387) |
Jul
(722) |
Aug
(771) |
Sep
(167) |
Oct
(142) |
Nov
(384) |
Dec
(884) |
| 2010 |
Jan
(344) |
Feb
(82) |
Mar
(248) |
Apr
(341) |
May
(389) |
Jun
(289) |
Jul
(19) |
Aug
(478) |
Sep
(274) |
Oct
(431) |
Nov
(322) |
Dec
(207) |
| 2011 |
Jan
(125) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:52:48
|
Update of /cvsroot/tolven/tolvenWEB/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20102/manifest Modified Files: Tag: V2 tolven-plugin.xml Log Message: In default Tolven, the keysOptional feature is set to false. Users with no user private keys cannot create Accounts or be added to an Account Allow a user to be reinvited to an Account if there is a need to change their user keys Use Faces messages to indicate when a user cannot log into an Account when no user key is present Index: tolven-plugin.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/manifest/tolven-plugin.xml,v retrieving revision 1.68.2.55 retrieving revision 1.68.2.56 diff -C2 -d -r1.68.2.55 -r1.68.2.56 *** tolven-plugin.xml 5 Jan 2011 04:17:06 -0000 1.68.2.55 --- tolven-plugin.xml 15 Jan 2011 09:52:40 -0000 1.68.2.56 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.component.tolvenweb" version="2.0.116" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.component.war" /> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.component.tolvenweb" version="2.0.117" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.component.war" /> |
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:52:18
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20024/src/org/tolven/core/bean Modified Files: Tag: V2 AccountDAOBean.java Log Message: In default Tolven, the keysOptional feature is set to false. Users with no user private keys cannot create Accounts or be added to an Account Allow a user to be reinvited to an Account if there is a need to change their user keys Index: AccountDAOBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/AccountDAOBean.java,v retrieving revision 1.52.2.14 retrieving revision 1.52.2.15 diff -C2 -d -r1.52.2.14 -r1.52.2.15 *** AccountDAOBean.java 9 Dec 2010 09:49:31 -0000 1.52.2.14 --- AccountDAOBean.java 15 Jan 2011 09:52:10 -0000 1.52.2.15 *************** *** 43,47 **** import org.tolven.app.entity.MenuStructure; import org.tolven.core.AccountDAOLocal; - import org.tolven.core.ActivationLocal; import org.tolven.core.SponsoredUser; import org.tolven.core.TolvenPropertiesLocal; --- 43,46 ---- *************** *** 80,86 **** @Resource private EJBContext ejbContext; - - @EJB - private ActivationLocal activationBean; @EJB --- 79,82 ---- *************** *** 320,324 **** */ public AccountUser addAccountUser(Account account, TolvenUser user, Date now, boolean accountPermission, PublicKey userPublicKey) { ! return addAccountUser(account, user, null, now, accountPermission, userPublicKey); } --- 316,320 ---- */ public AccountUser addAccountUser(Account account, TolvenUser user, Date now, boolean accountPermission, PublicKey userPublicKey) { ! return addAccountUser(null, account, user, null, now, accountPermission, userPublicKey); } *************** *** 332,363 **** * @param accountPermission boolean indicating if this user has account administration permission */ public AccountUser inviteAccountUser(Account account, AccountUser inviterAccountUser, TolvenUser invitedUser, PrivateKey anInviterUserPrivateKey, Date now, boolean accountPermission, PublicKey invitedUserPublicKey) { if (invitedUser==null) throw new NullPointerException("Missing TolvenUser object"); if (inviterAccountUser==null) throw new NullPointerException("Missing AccountUser object"); if (account==null) throw new NullPointerException("Missing Account object"); try { ! if (invitedUserPublicKey == null) { ! //The AccountPrivateKey will be stored unencrypted when invitedUserPublicKey == null ! //throw new RuntimeException("Invited user " + invitedUser.getLdapUID() + " has no PublicKey to protect the AccountPrivateKey"); } - // TODO: The correct location of the creation of an Invitation is still to be determined. It is created - // here, for demo purposes, but is not persisted AccountPrivateKey inviterAccountPrivateKey = inviterAccountUser.getAccountPrivateKey(); ! if (inviterAccountPrivateKey == null) ! throw new RuntimeException("No AccountPrivateKey found for " + ejbContext.getCallerPrincipal()); ! Invitation invitation = null; AccountPrivateKey invitedAccountPrivateKey = AccountPrivateKey.getInstance(); String kbeKeyAlgorithm = propertyBean.getProperty(AccountSecretKey.ACCOUNT_USER_KBE_KEY_ALGORITHM_PROP); int kbeKeyLength = Integer.parseInt(propertyBean.getProperty(AccountSecretKey.ACCOUNT_USER_KBE_KEY_LENGTH)); invitedAccountPrivateKey.init(inviterAccountPrivateKey, anInviterUserPrivateKey, invitedUserPublicKey, kbeKeyAlgorithm, kbeKeyLength); ! invitation = new Invitation(); invitation.setStatus(Status.INACTIVE.value()); invitation.setAccountPrivateKey(invitedAccountPrivateKey); ! return addAccountUser(account, invitedUser, invitation, now, accountPermission, invitedUserPublicKey); } catch (Exception ex) { - //TODO: consider declaring exceptions in the method declaration throw new RuntimeException("Problem with inviteAccountUser for " + invitedUser.getLdapUID(), ex); } } public TolvenUser findSystemUser( String principal, String status) { Query query = em.createQuery("SELECT u FROM TolvenUser u WHERE u.ldapUID = :principal " + --- 328,384 ---- * @param accountPermission boolean indicating if this user has account administration permission */ + @Override public AccountUser inviteAccountUser(Account account, AccountUser inviterAccountUser, TolvenUser invitedUser, PrivateKey anInviterUserPrivateKey, Date now, boolean accountPermission, PublicKey invitedUserPublicKey) { + return inviteAccountUser(account, inviterAccountUser, invitedUser, anInviterUserPrivateKey, now, accountPermission, invitedUserPublicKey, false); + } + + /** + * Update the AccountUser with AccountPrivateKey encrypted with the provided invitedUserPublicKey (required when + * a user obtains a new user public key). The invited user must exist on the Account, and already have an AccountPrivateKey. + * The invited user's public key (certificate) must also be supplied + * + * @param account The existing (although possibly very recent) Account object + * @param inviterAccountUser The AccountUser of the inviter + * @param invitedUser the existing (although possibly very recent) TolvenUser object + * @param anInviterUserPrivateKey the PrivateKey of the inviter of the Account + * @param now Transactional "now" time + * @param accountPermission boolean indicating if this user has account administration permission + */ + @Override + public AccountUser inviteAccountUser(Account account, AccountUser inviterAccountUser, TolvenUser invitedUser, PrivateKey anInviterUserPrivateKey, Date now, boolean accountPermission, PublicKey invitedUserPublicKey, boolean isReinvite) { if (invitedUser==null) throw new NullPointerException("Missing TolvenUser object"); if (inviterAccountUser==null) throw new NullPointerException("Missing AccountUser object"); if (account==null) throw new NullPointerException("Missing Account object"); + AccountUser invitedAccountUser = findAccountUser(invitedUser.getLdapUID(), account.getId()); try { ! if(isReinvite) { ! if(invitedAccountUser == null) { ! throw new RuntimeException("Invited user " + invitedUser.getLdapUID() + " is not currently a user of account: " + account.getId()); ! } ! if (invitedUserPublicKey == null) { ! throw new RuntimeException("Invited user " + invitedUser.getLdapUID() + " must have a PublicKey to protect the AccountPrivateKey in account: " + account.getId()); ! } ! } else { ! if(invitedAccountUser != null) { ! throw new RuntimeException("Invited user " + invitedUser.getLdapUID() + " is already a user of account: " + account.getId()); ! } } AccountPrivateKey inviterAccountPrivateKey = inviterAccountUser.getAccountPrivateKey(); ! if (inviterAccountPrivateKey == null) { ! throw new RuntimeException("No AccountPrivateKey found for " + ejbContext.getCallerPrincipal() + " for account: " + account.getId()); ! } AccountPrivateKey invitedAccountPrivateKey = AccountPrivateKey.getInstance(); String kbeKeyAlgorithm = propertyBean.getProperty(AccountSecretKey.ACCOUNT_USER_KBE_KEY_ALGORITHM_PROP); int kbeKeyLength = Integer.parseInt(propertyBean.getProperty(AccountSecretKey.ACCOUNT_USER_KBE_KEY_LENGTH)); invitedAccountPrivateKey.init(inviterAccountPrivateKey, anInviterUserPrivateKey, invitedUserPublicKey, kbeKeyAlgorithm, kbeKeyLength); ! Invitation invitation = new Invitation(); invitation.setStatus(Status.INACTIVE.value()); invitation.setAccountPrivateKey(invitedAccountPrivateKey); ! return addAccountUser(invitedAccountUser, account, invitedUser, invitation, now, accountPermission, invitedUserPublicKey); } catch (Exception ex) { throw new RuntimeException("Problem with inviteAccountUser for " + invitedUser.getLdapUID(), ex); } } + public TolvenUser findSystemUser( String principal, String status) { Query query = em.createQuery("SELECT u FROM TolvenUser u WHERE u.ldapUID = :principal " + *************** *** 580,588 **** * @param accountPermission boolean indicating if this user has account administration permission */ ! private AccountUser addAccountUser(Account account, TolvenUser user, Invitation invitation, Date now, boolean accountPermission, PublicKey invitedUserPublicKey) { // TODO: Note that the invitation supplied here by the method // inviteAccountUser, is not fully implemented, until this todo is // removed, and it may also be null. ! AccountUser au = new AccountUser(); au.setAccount(account); au.setUser(user); --- 601,615 ---- * @param accountPermission boolean indicating if this user has account administration permission */ ! private AccountUser addAccountUser(AccountUser invitedAccountUser, Account account, TolvenUser user, Invitation invitation, Date now, boolean accountPermission, PublicKey invitedUserPublicKey) { // TODO: Note that the invitation supplied here by the method // inviteAccountUser, is not fully implemented, until this todo is // removed, and it may also be null. ! AccountUser au = null; ! if(invitedAccountUser == null) { ! au = new AccountUser(); ! } else { ! au = invitedAccountUser; ! logger.info(user.getLdapUID() + " is being reinvited to account: " + account.getId()); ! } au.setAccount(account); au.setUser(user); *************** *** 598,601 **** --- 625,629 ---- // experimental, then developers are free to play by setting System // property tolven.security.keys.activate + // TODO: At this point the AccountUser cannot have a PrivateKey setupAccountKeys(account, au, invitation, user, invitedUserPublicKey); em.persist(au); *************** *** 619,636 **** String message = null; if(account.getId() == 0) { ! message = "A UserPublicKey (User Certificate) is required to create an Account"; } else { ! message = "A UserPublicKey (User Certificate) is required by users of this Account"; } throw new RuntimeException(message); } } - // TODO: At this point the AccountUser cannot have a PrivateKey - if (accountUser.hasAccountPrivateKey()) { - throw new RuntimeException("AccountUser already has an AccountPrivateKey"); - } if (account.hasPublicKey()) { if (invitation == null) { ! throw new RuntimeException("An invitation is required to obtain an AccountPrivateKey"); } else { accountUser.setAccountPrivateKey(invitation.getAccountPrivateKey()); --- 647,660 ---- String message = null; if(account.getId() == 0) { ! message = "A UserPublicKey (User Certificate) is required to create an account for: " + user.getLdapUID(); } else { ! message = "A UserPublicKey (User Certificate) is required by users of account: " + account.getId(); } throw new RuntimeException(message); } } if (account.hasPublicKey()) { if (invitation == null) { ! throw new RuntimeException("An invitation is required to obtain an AccountPrivateKey for account: " + account.getId()); } else { accountUser.setAccountPrivateKey(invitation.getAccountPrivateKey()); |
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:52:18
|
Update of /cvsroot/tolven/tolvenEJB/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20024/manifest Modified Files: Tag: V2 tolven-plugin.xml Log Message: In default Tolven, the keysOptional feature is set to false. Users with no user private keys cannot create Accounts or be added to an Account Allow a user to be reinvited to an Account if there is a need to change their user keys Index: tolven-plugin.xml =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/manifest/tolven-plugin.xml,v retrieving revision 1.68.2.24 retrieving revision 1.68.2.25 diff -C2 -d -r1.68.2.24 -r1.68.2.25 *** tolven-plugin.xml 24 Dec 2010 01:13:33 -0000 1.68.2.24 --- tolven-plugin.xml 15 Jan 2011 09:52:10 -0000 1.68.2.25 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.component.tolvenejb" version="2.0.92" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.assembler.ejbmodule" /> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.component.tolvenejb" version="2.0.93" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.assembler.ejbmodule" /> |
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:52:18
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20024/src/org/tolven/core Modified Files: Tag: V2 AccountDAOLocal.java Log Message: In default Tolven, the keysOptional feature is set to false. Users with no user private keys cannot create Accounts or be added to an Account Allow a user to be reinvited to an Account if there is a need to change their user keys Index: AccountDAOLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/AccountDAOLocal.java,v retrieving revision 1.23.2.8 retrieving revision 1.23.2.9 diff -C2 -d -r1.23.2.8 -r1.23.2.9 *** AccountDAOLocal.java 30 Nov 2010 09:14:39 -0000 1.23.2.8 --- AccountDAOLocal.java 15 Jan 2011 09:52:10 -0000 1.23.2.9 *************** *** 153,156 **** --- 153,161 ---- */ public AccountUser inviteAccountUser(Account account, AccountUser accountUser, TolvenUser invidtedUser, PrivateKey anInviterPrivateKey, Date now, boolean accountPermission, PublicKey userPublicKey ); + + /** + * Invite or reinvite a user to an Account + */ + public AccountUser inviteAccountUser(Account account, AccountUser accountUser, TolvenUser invidtedUser, PrivateKey anInviterPrivateKey, Date now, boolean accountPermission, PublicKey userPublicKey, boolean isReinvite); /** |
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:45:27
|
Update of /cvsroot/tolven/tolvenAPI/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18779/manifest Modified Files: Tag: V2 tolven-plugin.xml Log Message: Remove the HTML sections showing up in exceptions from tolvenAPI to tolvenWeb In default Tolven, the keysOptional feature is set to false. Users with no user private keys cannot be added to an Account Index: tolven-plugin.xml =================================================================== RCS file: /cvsroot/tolven/tolvenAPI/manifest/tolven-plugin.xml,v retrieving revision 1.1.2.29 retrieving revision 1.1.2.30 diff -C2 -d -r1.1.2.29 -r1.1.2.30 *** tolven-plugin.xml 9 Jan 2011 04:10:58 -0000 1.1.2.29 --- tolven-plugin.xml 15 Jan 2011 09:45:19 -0000 1.1.2.30 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.api" version="2.0.28" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.component.war" /> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.api" version="2.0.29" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.component.war" /> |
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:45:27
|
Update of /cvsroot/tolven/tolvenAPI/api/source/org/tolven/api/security In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18779/api/source/org/tolven/api/security Modified Files: Tag: V2 GeneralSecurityFilter.java Log Message: Remove the HTML sections showing up in exceptions from tolvenAPI to tolvenWeb In default Tolven, the keysOptional feature is set to false. Users with no user private keys cannot be added to an Account Index: GeneralSecurityFilter.java =================================================================== RCS file: /cvsroot/tolven/tolvenAPI/api/source/org/tolven/api/security/Attic/GeneralSecurityFilter.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** GeneralSecurityFilter.java 2 Dec 2010 02:23:27 -0000 1.1.2.6 --- GeneralSecurityFilter.java 15 Jan 2011 09:45:19 -0000 1.1.2.7 *************** *** 36,54 **** public class GeneralSecurityFilter implements Filter { ! public static String INVITATION_ID = "invitationId"; ! public static String ACCOUNT_ID = "accountId"; ! public static String ACCOUNTUSER = "accountUser"; ! public static String ACCOUNTUSERS = "accountUsers"; ! public static String ACCOUNTUSER_TIMESTAMP = "accountUserTimestamp"; ! public static String USERACCOUNT = "userAccount"; ! public static String ACCOUNTUSER_ID = "accountUserId"; ! public static String PROPOSED_ACCOUNTUSER_ID = "proposedAccountUserId"; ! public static String PROPOSED_DEFAULT_ACCOUNT = "proposedDefaultAccount"; // true | false ! public static String ACCOUNT_HOME = "accountHome"; ! public static String PROPOSED_ACCOUNT_HOME = "proposedAccountHome"; ! public static String TOLVENUSER_ID = "TolvenUserId"; ! public static String VESTIBULE_PASS = "vestibulePass"; // true | false ! public static String VESTIBULE_REDIRECT = "vestibuleRedirect"; ! public static String USER_CONTEXT = "userContext"; @EJB --- 36,55 ---- public class GeneralSecurityFilter implements Filter { ! public static final String INVITATION_ID = "invitationId"; ! public static final String ACCOUNT_ID = "accountId"; ! public static final String ACCOUNTUSER = "accountUser"; ! public static final String ACCOUNTUSERS = "accountUsers"; ! public static final String ACCOUNTUSER_TIMESTAMP = "accountUserTimestamp"; ! public static final String USERACCOUNT = "userAccount"; ! public static final String ACCOUNTUSER_ID = "accountUserId"; ! public static final String PROPOSED_ACCOUNTUSER_ID = "proposedAccountUserId"; ! public static final String PROPOSED_DEFAULT_ACCOUNT = "proposedDefaultAccount"; // true | false ! public static final String ACCOUNT_HOME = "accountHome"; ! public static final String PROPOSED_ACCOUNT_HOME = "proposedAccountHome"; ! public static final String TOLVENUSER_ID = "TolvenUserId"; ! public static final String VESTIBULE_PASS = "vestibulePass"; // true | false ! public static final String VESTIBULE_REDIRECT = "vestibuleRedirect"; ! public static final String USER_CONTEXT = "userContext"; ! public static final String USER_KEYS_OPTIONAL = "tolven.security.user.keysOptional"; @EJB |
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:45:27
|
Update of /cvsroot/tolven/tolvenAPI/api/source/org/tolven/restful In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18779/api/source/org/tolven/restful Modified Files: Tag: V2 VestibuleResources.java Log Message: Remove the HTML sections showing up in exceptions from tolvenAPI to tolvenWeb In default Tolven, the keysOptional feature is set to false. Users with no user private keys cannot be added to an Account Index: VestibuleResources.java =================================================================== RCS file: /cvsroot/tolven/tolvenAPI/api/source/org/tolven/restful/Attic/VestibuleResources.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** VestibuleResources.java 9 Jan 2011 04:10:59 -0000 1.1.2.6 --- VestibuleResources.java 15 Jan 2011 09:45:19 -0000 1.1.2.7 *************** *** 3,6 **** --- 3,7 ---- import java.io.InputStream; import java.security.Principal; + import java.security.PrivateKey; import java.util.ArrayList; import java.util.Arrays; *************** *** 38,44 **** --- 39,47 ---- import org.tolven.core.AccountDAOLocal; import org.tolven.core.ActivationLocal; + import org.tolven.core.TolvenPropertiesLocal; import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountUser; import org.tolven.core.entity.TolvenUser; + import org.tolven.security.key.UserPrivateKey; import org.tolven.sso.TolvenSSO; import org.tolven.util.ExceptionFormatter; *************** *** 64,67 **** --- 67,73 ---- private MenuLocal menuBean; + @EJB + private TolvenPropertiesLocal propertyBean; + private javax.naming.Context ctx; private static List<String> vestibuleJNDINames = new ArrayList<String>(); *************** *** 189,193 **** } } ! throw new RuntimeException(ex); } } --- 195,199 ---- } } ! return Response.status(Status.INTERNAL_SERVER_ERROR).type(MediaType.TEXT_PLAIN).entity(ExceptionFormatter.toSimpleString(ex, "\\n")).build(); } } *************** *** 203,206 **** --- 209,220 ---- throw new RuntimeException("accountUser does not exist with Id: " + accountUserId); } + String userKeysOptional = propertyBean.getProperty(GeneralSecurityFilter.USER_KEYS_OPTIONAL); + if (!Boolean.parseBoolean(userKeysOptional)) { + String keyAlgorithm = propertyBean.getProperty(UserPrivateKey.USER_PRIVATE_KEY_ALGORITHM_PROP); + PrivateKey privateKey = TolvenSSO.getInstance().getUserPrivateKey(request, keyAlgorithm); + if (privateKey == null) { + throw new RuntimeException("User requires a UserPrivateKey to log into account: " + accountUser.getAccount().getId()); + } + } // Save ACCOUNTUSER in session for subsequent request so the security filters can intercept appropriately TolvenSSO.getInstance().setSessionProperty(GeneralSecurityFilter.ACCOUNTUSER_ID, String.valueOf(accountUser.getId()), request); |
|
From: Joseph I. <jos...@us...> - 2011-01-15 09:40:28
|
Update of /cvsroot/tolven/pluginOpenAMConfig/openam-conf In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17784/openam-conf Modified Files: Tag: V2 tolven-policies.xml Log Message: Make inetUser and inetUserStatus available to the tolven datastore Add /Tolven/document URLs to tolvenweb.policy Index: tolven-policies.xml =================================================================== RCS file: /cvsroot/tolven/pluginOpenAMConfig/openam-conf/Attic/tolven-policies.xml,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** tolven-policies.xml 6 Jan 2011 00:53:56 -0000 1.1.2.9 --- tolven-policies.xml 15 Jan 2011 09:40:19 -0000 1.1.2.10 *************** *** 725,728 **** --- 725,752 ---- </AttributeValuePair> </Rule> + <Rule name="https://-*-.able.com:8443/Tolven/document/*?*"> + <ServiceName name="iPlanetAMWebAgentService" /> + <ResourceName name="https://-*-.able.com:8443/Tolven/document/*?*" /> + <AttributeValuePair> + <Attribute name="GET" /> + <Value>allow</Value> + </AttributeValuePair> + <AttributeValuePair> + <Attribute name="POST" /> + <Value>allow</Value> + </AttributeValuePair> + </Rule> + <Rule name="https://-*-.able.com:8443/Tolven/document/*"> + <ServiceName name="iPlanetAMWebAgentService" /> + <ResourceName name="https://-*-.able.com:8443/Tolven/document/*" /> + <AttributeValuePair> + <Attribute name="GET" /> + <Value>allow</Value> + </AttributeValuePair> + <AttributeValuePair> + <Attribute name="POST" /> + <Value>allow</Value> + </AttributeValuePair> + </Rule> <Rule name="https://-*-.able.com:8443/Tolven/drilldown/*"> <ServiceName name="iPlanetAMWebAgentService" /> |
|
From: John C. <jc...@us...> - 2011-01-12 16:14:53
|
Update of /cvsroot/tolven/pluginJAXRS/web/source/org/tolven/api/xml/userAccounts In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24070/web/source/org/tolven/api/xml/userAccounts Log Message: Directory /cvsroot/tolven/pluginJAXRS/web/source/org/tolven/api/xml/userAccounts added to the repository |
|
From: John C. <jc...@us...> - 2011-01-12 16:14:52
|
Update of /cvsroot/tolven/pluginJAXRS/web/source/org/tolven/api/xml In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24070/web/source/org/tolven/api/xml Log Message: Directory /cvsroot/tolven/pluginJAXRS/web/source/org/tolven/api/xml added to the repository |
|
From: John C. <jc...@us...> - 2011-01-12 16:10:43
|
Update of /cvsroot/tolven/CVSROOT In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23523 Modified Files: avail Log Message: Making CVS read only as we convert to SVN Index: avail =================================================================== RCS file: /cvsroot/tolven/CVSROOT/avail,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** avail 16 Nov 2010 02:57:20 -0000 1.140 --- avail 12 Jan 2011 16:10:34 -0000 1.141 *************** *** 1,38 **** unavail - avail|jchurin - avail|neil_cowles|tolvenTRIM - avail|joseph_isaac - avail|skandula|pluginPathology - avail|skandula|tolvenWEB - avail|skandula|pluginTrims - avail|skandula|pluginWebserver - avail|skandula|tolvenLocale_en - avail|skandula|pluginApplications - avail|skandula||BUG_2779527_SK - avail|skandula|tolvenWiki - avail|skandula||BUG_2746233_SK - avail|skandula|pluginAPIschema - avail|skandula|pluginJAXRS - avail|skandula|pluginOpenAMConfig - avail|skandula||BUG_2553647_SC - avail|skandula|pluginObservations - avail|skandula|pluginIndexDocuments - avail|schillara_th||BUG_2760056_kbx - avail|schillara_th|tolvenWiki - avail|schillara_th||BUG_2553647_SCx - avail|schillara_th|pluginTrimPulseRate - avail|schillara_th|pluginTrimRespirationRate - avail|schillara_th|pluginTrimTemparature - avail|schillara_th|pluginTrimWeight - avail|schillara_th|pluginTrimGlasgowComaScale - avail|schillara_th|pluginTrimRash - avail|schillara_th|pluginTrimBloodGlucose - avail|schillara_th|pluginTrimBloodPressure - avail|schillara_th|pluginTrimBodyMassIndex - avail|schillara_th|pluginTrimPeakFlow - avail|schillara_th|tolvenWEB - avail|schillara_th|tolvenEJB - avail|schillara_th|tolvenLocale - avail|schillara_th|pluginTrims - avail|schillara_th|pluginApplications - avail|schillara_th|pluginIndexDocuments --- 1 ---- |
|
From: John C. <jc...@us...> - 2011-01-12 07:29:14
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/xml In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12865/src/org/tolven/xml Modified Files: ParseXML.java Removed Files: NamespacePrefixMapperImpl.java Log Message: Avoid using NamespacePrefixMapper since it is an implementation-specific JAXB property. --- NamespacePrefixMapperImpl.java DELETED --- Index: ParseXML.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/xml/ParseXML.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ParseXML.java 23 Jul 2010 11:21:10 -0000 1.2 --- ParseXML.java 12 Jan 2011 07:29:06 -0000 1.3 *************** *** 29,33 **** Marshaller m = getJAXBContext().createMarshaller(); m.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE ); ! m.setProperty( "com.sun.xml.internal.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl()); return m; --- 29,33 ---- Marshaller m = getJAXBContext().createMarshaller(); m.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE ); ! // m.setProperty( "com.sun.xml.internal.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl()); return m; |
|
From: John C. <jc...@us...> - 2011-01-12 07:29:14
|
Update of /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/xml In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12865/src/test/org/tolven/trim/xml Modified Files: XMLTestBase.java Log Message: Avoid using NamespacePrefixMapper since it is an implementation-specific JAXB property. Index: XMLTestBase.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/xml/XMLTestBase.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** XMLTestBase.java 12 Jan 2011 06:27:27 -0000 1.10 --- XMLTestBase.java 12 Jan 2011 07:29:06 -0000 1.11 *************** *** 36,40 **** m.setProperty( Marshaller.JAXB_FRAGMENT, fragment ); // m.setProperty(Marshaller.JAXB_SCHEMA_LOCATION, "http://www.tolven.org/schema/trim4.xsd" ); ! m.setProperty( "com.sun.xml.internal.bind.namespacePrefixMapper",new NamespacePrefixMapperImpl()); StringWriter result = new StringWriter( 1000 ); m.marshal( top, result ); --- 36,40 ---- m.setProperty( Marshaller.JAXB_FRAGMENT, fragment ); // m.setProperty(Marshaller.JAXB_SCHEMA_LOCATION, "http://www.tolven.org/schema/trim4.xsd" ); ! // m.setProperty( "com.sun.xml.internal.bind.namespacePrefixMapper",new NamespacePrefixMapperImpl()); StringWriter result = new StringWriter( 1000 ); m.marshal( top, result ); |
|
From: John C. <jc...@us...> - 2011-01-12 06:27:35
|
Update of /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/xml In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2168/src/test/org/tolven/trim/xml Modified Files: CDTests.java XMLTestBase.java Log Message: Add Unit test for new TRIM parsing technique that does EL evaluation on an element by element basis. Index: XMLTestBase.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/xml/XMLTestBase.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** XMLTestBase.java 23 Jul 2010 11:21:10 -0000 1.9 --- XMLTestBase.java 12 Jan 2011 06:27:27 -0000 1.10 *************** *** 55,59 **** public Object unmarshalStream( JAXBContext jc, XMLStreamReader input, Object factory ) throws JAXBException { Unmarshaller u = jc.createUnmarshaller(); ! u.setProperty("com.sun.xml.bind.ObjectFactory", factory); Object o = u.unmarshal( input ); return o; --- 55,59 ---- public Object unmarshalStream( JAXBContext jc, XMLStreamReader input, Object factory ) throws JAXBException { Unmarshaller u = jc.createUnmarshaller(); ! // u.setProperty("com.sun.xml.bind.ObjectFactory", factory); Object o = u.unmarshal( input ); return o; *************** *** 62,66 **** public Trim unmarshalStream( JAXBContext jc, InputStream input, Object factory ) throws JAXBException { Unmarshaller u = jc.createUnmarshaller(); ! u.setProperty("com.sun.xml.bind.ObjectFactory", factory); Object o = u.unmarshal( input ); return (Trim) o; --- 62,66 ---- public Trim unmarshalStream( JAXBContext jc, InputStream input, Object factory ) throws JAXBException { Unmarshaller u = jc.createUnmarshaller(); ! // u.setProperty("com.sun.xml.bind.ObjectFactory", factory); Object o = u.unmarshal( input ); return (Trim) o; Index: CDTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/xml/CDTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CDTests.java 20 Jan 2010 20:10:51 -0000 1.2 --- CDTests.java 12 Jan 2011 06:27:27 -0000 1.3 *************** *** 47,51 **** ConceptGroup cg = new ConceptGroup(); cg.getCodes().add(cd); ! cg.setName("aConceptGroup"); // Marshal to XML. // String xml = marshal( new JAXBElement<Datatypes>( new QName("urn:tolven-org:trim:4.0","Datatypes"), Datatypes.class, datatypes), Boolean.TRUE ); --- 47,51 ---- ConceptGroup cg = new ConceptGroup(); cg.getCodes().add(cd); ! cg.setName("&aConceptGroup<"); // Marshal to XML. // String xml = marshal( new JAXBElement<Datatypes>( new QName("urn:tolven-org:trim:4.0","Datatypes"), Datatypes.class, datatypes), Boolean.TRUE ); *************** *** 55,59 **** // Now unmarshal back to objects Object rslt = unmarshal(jc, xml, factory); ! logger.info(rslt); } } --- 55,59 ---- // Now unmarshal back to objects Object rslt = unmarshal(jc, xml, factory); ! logger.info(rslt.toString()); } } |
|
From: John C. <jc...@us...> - 2011-01-12 06:27:35
|
Update of /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/el In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2168/src/test/org/tolven/trim/el Added Files: testel.trim.xml ParseAndEvaluate.java Log Message: Add Unit test for new TRIM parsing technique that does EL evaluation on an element by element basis. --- NEW FILE: ParseAndEvaluate.java --- package test.org.tolven.trim.el; import java.io.FileNotFoundException; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.tolven.app.el.TrimExpressionEvaluator; import junit.framework.TestCase; public class ParseAndEvaluate extends TestCase { protected void setUp() throws Exception { super.setUp(); } public void testParse() throws FileNotFoundException, XMLStreamException { TrimExpressionEvaluator ee = new TrimExpressionEvaluator(); ee.addVariable("spaces", "Variable with embedded spaces"); ee.addVariable("ampersand", "Variable with embedded & ampersand"); ee.addVariable("backslash", "Variable with embedded \\ backslash"); ee.addVariable("lessthan", "Variable with embedded < less than"); ee.addVariable("greaterthan", "Variable with embedded > greater than"); XMLInputFactory inputFactory = XMLInputFactory.newInstance(); XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); XMLStreamReader reader = inputFactory.createXMLStreamReader(getClass().getResourceAsStream("testel.trim.xml"),"UTF-8"); XMLStreamWriter writer = outputFactory.createXMLStreamWriter(System.out,"UTF-8"); while ( reader.hasNext()) { switch (reader.getEventType()) { // writer.writeProcessingInstruction(reader.getPIData()); case XMLStreamReader.START_DOCUMENT: writer.writeStartDocument(reader.getEncoding(), reader.getVersion()); writer.writeCharacters("\n"); break; case XMLStreamReader.END_DOCUMENT: writer.writeEndDocument(); break; case XMLStreamReader.CHARACTERS: writer.writeCharacters((String)ee.evaluate(reader.getText())); break; case XMLStreamReader.START_ELEMENT: writer.writeStartElement(reader.getLocalName()); for (int n = 0; n < reader.getNamespaceCount(); n++) { writer.writeNamespace(reader.getNamespacePrefix(n), reader.getNamespaceURI(n)); } for (int a = 0; a < reader.getAttributeCount();a++) { writer.writeAttribute(reader.getAttributeLocalName(a), (String)ee.evaluate(reader.getAttributeValue(a))); } break; case XMLStreamReader.END_ELEMENT: writer.writeEndElement(); break; } reader.next(); } reader.close(); writer.close(); } } --- NEW FILE: testel.trim.xml --- <?xml version="1.0" encoding="UTF-8"?> <trim xmlns="urn:tolven-org:trim:4.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 http://tolven.org/xsd/trim4"> <name>testtrim</name> <description>#{ampersand}</description> <page>#{backslash}</page> <drilldown>#{greaterthan}</drilldown> <menu>#{lessthan}</menu> <tolvenId application="#{spaces}"/> <field name="race"> <value xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">#{'a'}</value> </field> </trim> |
|
From: John C. <jc...@us...> - 2011-01-12 06:27:31
|
Update of /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/el In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2133/src/test/org/tolven/trim/el Log Message: Directory /cvsroot/tolven/tolvenEJB/src/test/org/tolven/trim/el added to the repository |
|
From: Joseph I. <jos...@us...> - 2011-01-11 08:33:13
|
Update of /cvsroot/tolven/pluginOpenDSConfig In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2710 Modified Files: Tag: V2 build.xml tolven-aci.ldif Added Files: Tag: V2 tolven-user-status.ldif Log Message: Added new file: tolven-user-status.ldif, which introduces the ability to activate/inactivate users, but requires OpenDS schemas to be extended Ensure that certain OpenDS attributes (in particular inetUserStatus), cannot be modified by a user Index: build.xml =================================================================== RCS file: /cvsroot/tolven/pluginOpenDSConfig/build.xml,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** build.xml 15 Dec 2010 02:30:03 -0000 1.1.2.2 --- build.xml 11 Jan 2011 08:33:05 -0000 1.1.2.3 *************** *** 33,39 **** <zip destfile="${zipFileName}" update="true"> <zipfileset dir="."> ! <include name="tolven-aci.ldif" /> ! <include name="tolven-admin.ldif" /> ! <include name="tolven-delegation.ldif" /> <include name="config/**" /> </zipfileset> --- 33,37 ---- <zip destfile="${zipFileName}" update="true"> <zipfileset dir="."> ! <include name="*.ldif" /> <include name="config/**" /> </zipfileset> --- NEW FILE: tolven-user-status.ldif --- dn: cn=schema changetype: modify add: attributeTypes attributeTypes: ( 1.2.840.113556.1.2.102 NAME 'memberOf' DESC 'Group that the entry belongs to' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) attributeTypes: ( 2.16.840.1.113730.3.1.692 NAME 'inetUserStatus' DESC '"active", "inactive", or "deleted" status of a user' EQUALITY caseIgnoreMatch SINGLE-VALUE SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Nortel subscriber interoperability' ) dn: cn=schema changetype: modify add: objectClasses objectClasses: ( 2.16.840.1.113730.3.2.130 NAME 'inetUser' DESC 'Auxiliary class which has to be present in an entry for delivery of subscriber services' SUP top AUXILIARY MAY ( uid $ inetUserStatus $ userPassword $ memberOf ) X-ORIGIN 'Nortel subscriber interoperability' ) Index: tolven-aci.ldif =================================================================== RCS file: /cvsroot/tolven/pluginOpenDSConfig/tolven-aci.ldif,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** tolven-aci.ldif 13 Dec 2010 09:55:45 -0000 1.1 --- tolven-aci.ldif 11 Jan 2011 08:33:05 -0000 1.1.2.1 *************** *** 8,9 **** --- 8,25 ---- add: aci aci: (target="ldap:///*,ou=groups,dc=tolven,dc=com")(targetattr="*") (version 3.0; acl "Tolven Manager"; allow (all) groupdn="ldap:///cn=Administrator,ou=groups,dc=tolven,dc=com";) + + dn:ou=people,dc=tolven,dc=com + changetype:modify + add:aci + aci: (targetattr = "objectclass || inetuserstatus || iplanet-am-user-login-statu + s || iplanet-am-user-account-life || iplanet-am-session-quota-limit || iplanet-a + m-user-alias-list || iplanet-am-session-max-session-time || iplanet-am-session- + max-idle-time || iplanet-am-session-get-valid-sessions || iplanet-am-session-des + troy-sessions || iplanet-am-session-add-session-listener-on-all-sessions || ipla + net-am-user-admin-start-dn || iplanet-am-auth-post-login-process-class || iplane + t-am-saml-user || iplanet-am-saml-password || iplanet-am-user-federation-info || + iplanet-am-user-federation-info-key || ds-pwp-account-disabled || sun-fm-saml2- + nameid-info || sun-fm-saml2-nameid-infokey || sunAMAuthInvalidAttemptsData || me + mberof || member")(targetfilter="(!(userdn=cn=Administrator,ou=groups,dc=tolven, + dc=com))")(version 3.0; acl "OpenAM User self modification denied"; deny (write) + userdn ="ldap:///self";) \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2011-01-11 08:33:13
|
Update of /cvsroot/tolven/pluginOpenDSConfig/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2710/manifest Modified Files: Tag: V2 tolven-plugin.xml Log Message: Added new file: tolven-user-status.ldif, which introduces the ability to activate/inactivate users, but requires OpenDS schemas to be extended Ensure that certain OpenDS attributes (in particular inetUserStatus), cannot be modified by a user Index: tolven-plugin.xml =================================================================== RCS file: /cvsroot/tolven/pluginOpenDSConfig/manifest/tolven-plugin.xml,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** tolven-plugin.xml 15 Dec 2010 02:30:03 -0000 1.1.2.3 --- tolven-plugin.xml 11 Jan 2011 08:33:05 -0000 1.1.2.4 *************** *** 1,2 **** <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.opends.config" version="2.0.4" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd" /> \ No newline at end of file --- 1,2 ---- <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.opends.config" version="2.0.5" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd" /> \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2011-01-11 08:33:00
|
Update of /cvsroot/tolven/pluginOpenAMConfig/openam-conf In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2616/openam-conf Added Files: Tag: V2 tolven-datastore-with-extensions.txt Log Message: Make inetUser and inetUserStatus available to the tolven datastore --- NEW FILE: tolven-datastore-with-extensions.txt --- sun-idrepo-ldapv3-config-ldap-server=dev.able.com:636 sun-idrepo-ldapv3-config-authid=uid=Manager,ou=people,dc=tolven,dc=com sun-idrepo-ldapv3-config-authpw=secret sun-idrepo-ldapv3-config-organization_name=dc=tolven,dc=com sun-idrepo-ldapv3-config-ssl-enabled=true sun-idrepo-ldapv3-config-user-objectclass=inetorgperson sun-idrepo-ldapv3-config-user-objectclass=inetUser sun-idrepo-ldapv3-config-user-objectclass=organizationalPerson sun-idrepo-ldapv3-config-user-objectclass=person sun-idrepo-ldapv3-config-user-objectclass=top sun-idrepo-ldapv3-config-user-attributes=cn sun-idrepo-ldapv3-config-user-attributes=givenName sun-idrepo-ldapv3-config-user-attributes=inetUserStatus sun-idrepo-ldapv3-config-user-attributes=mail sun-idrepo-ldapv3-config-user-attributes=sn sun-idrepo-ldapv3-config-user-attributes=uid sun-idrepo-ldapv3-config-user-attributes=userCertificate sun-idrepo-ldapv3-config-user-attributes=userPassword sun-idrepo-ldapv3-config-user-attributes=userPKCS12 sun-idrepo-ldapv3-config-psearchbase=dc=tolven,dc=com |
|
From: Joseph I. <jos...@us...> - 2011-01-11 08:33:00
|
Update of /cvsroot/tolven/pluginOpenAMConfig/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2616/manifest Modified Files: Tag: V2 tolven-plugin.xml Log Message: Make inetUser and inetUserStatus available to the tolven datastore Index: tolven-plugin.xml =================================================================== RCS file: /cvsroot/tolven/pluginOpenAMConfig/manifest/tolven-plugin.xml,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** tolven-plugin.xml 6 Jan 2011 00:53:56 -0000 1.1.2.13 --- tolven-plugin.xml 11 Jan 2011 08:32:52 -0000 1.1.2.14 *************** *** 1,2 **** <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.openam.config" version="2.0.14" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd" /> \ No newline at end of file --- 1,2 ---- <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.openam.config" version="2.0.15" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd" /> \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2011-01-11 08:32:46
|
Update of /cvsroot/tolven/pluginFramework/tpfboot/source/org/tolven/plugin/repository In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2572/tpfboot/source/org/tolven/plugin/repository Modified Files: Tag: V2 RepositorySnapshot.java RepositoryUpgrade.java ConfigPluginsWrapper.java Log Message: Bug to fix the use of the attributes useSnapshot and overwriteSnapshot in the tolven-config/plugins.xml A new kit is available with this change V2.0.26 Index: RepositoryUpgrade.java =================================================================== RCS file: /cvsroot/tolven/pluginFramework/tpfboot/source/org/tolven/plugin/repository/RepositoryUpgrade.java,v retrieving revision 1.10.2.4 retrieving revision 1.10.2.5 diff -C2 -d -r1.10.2.4 -r1.10.2.5 *** RepositoryUpgrade.java 10 Sep 2010 09:55:45 -0000 1.10.2.4 --- RepositoryUpgrade.java 11 Jan 2011 08:32:38 -0000 1.10.2.5 *************** *** 202,215 **** private boolean getUseSnapshotDefault(PluginPropertyDetail repositoryLibraryProperty) { ! String useSnapshotDefaultValue = getProperty(ConfigPluginsWrapper.USE_REPOSITORY_SNAPSHOT, repositoryLibraryProperty.getProperty()); boolean useSnapshotDefault = false; if (useSnapshotDefaultValue == null) { useSnapshotDefault = false; ! } else if (Boolean.TRUE.equals(useSnapshotDefaultValue)) { useSnapshotDefault = true; ! } else if (Boolean.FALSE.equals(useSnapshotDefaultValue)) { useSnapshotDefault = false; } else { ! throw new RuntimeException("Unrecognized property value for: " + ConfigPluginsWrapper.USE_REPOSITORY_SNAPSHOT); } return useSnapshotDefault; --- 202,215 ---- private boolean getUseSnapshotDefault(PluginPropertyDetail repositoryLibraryProperty) { ! String useSnapshotDefaultValue = getProperty(ConfigPluginsWrapper.USE_SNAPSHOT, repositoryLibraryProperty.getProperty()); boolean useSnapshotDefault = false; if (useSnapshotDefaultValue == null) { useSnapshotDefault = false; ! } else if (Boolean.TRUE.toString().equals(useSnapshotDefaultValue)) { useSnapshotDefault = true; ! } else if (Boolean.FALSE.toString().equals(useSnapshotDefaultValue)) { useSnapshotDefault = false; } else { ! throw new RuntimeException("Unrecognized property value for: " + ConfigPluginsWrapper.USE_SNAPSHOT + ": " + useSnapshotDefaultValue); } return useSnapshotDefault; Index: RepositorySnapshot.java =================================================================== RCS file: /cvsroot/tolven/pluginFramework/tpfboot/source/org/tolven/plugin/repository/Attic/RepositorySnapshot.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** RepositorySnapshot.java 10 Sep 2010 07:36:26 -0000 1.1.2.1 --- RepositorySnapshot.java 11 Jan 2011 08:32:38 -0000 1.1.2.2 *************** *** 144,157 **** private boolean getOverwriteSnapshot(PluginPropertyDetail repositoryLibraryProperty) { ! String overwriteSnapshotValue = getProperty(ConfigPluginsWrapper.OVERWRITE_REPOSITORY_SNAPSHOT, repositoryLibraryProperty.getProperty()); boolean overwriteSnapshot = false; if (overwriteSnapshotValue == null) { overwriteSnapshot = false; ! } else if (Boolean.TRUE.equals(overwriteSnapshotValue)) { overwriteSnapshot = true; ! } else if (Boolean.FALSE.equals(overwriteSnapshotValue)) { overwriteSnapshot = false; } else { ! throw new RuntimeException("Unrecognized property value for: " + ConfigPluginsWrapper.OVERWRITE_REPOSITORY_SNAPSHOT); } return overwriteSnapshot; --- 144,157 ---- private boolean getOverwriteSnapshot(PluginPropertyDetail repositoryLibraryProperty) { ! String overwriteSnapshotValue = getProperty(ConfigPluginsWrapper.OVERWRITE_SNAPSHOT, repositoryLibraryProperty.getProperty()); boolean overwriteSnapshot = false; if (overwriteSnapshotValue == null) { overwriteSnapshot = false; ! } else if (Boolean.TRUE.toString().equals(overwriteSnapshotValue)) { overwriteSnapshot = true; ! } else if (Boolean.FALSE.toString().equals(overwriteSnapshotValue)) { overwriteSnapshot = false; } else { ! throw new RuntimeException("Unrecognized property value for: " + ConfigPluginsWrapper.OVERWRITE_SNAPSHOT + ": " + overwriteSnapshotValue); } return overwriteSnapshot; Index: ConfigPluginsWrapper.java =================================================================== RCS file: /cvsroot/tolven/pluginFramework/tpfboot/source/org/tolven/plugin/repository/ConfigPluginsWrapper.java,v retrieving revision 1.6.4.2 retrieving revision 1.6.4.3 diff -C2 -d -r1.6.4.2 -r1.6.4.3 *** ConfigPluginsWrapper.java 10 Sep 2010 07:36:26 -0000 1.6.4.2 --- ConfigPluginsWrapper.java 11 Jan 2011 08:32:38 -0000 1.6.4.3 *************** *** 52,57 **** public static final String REPOSITORY_TRUNK_METADATA = "trunkMetadata"; public static final String REPOSITORY_SNAPSHOT_METADATA = "snapshotMetadata"; ! public static final String USE_REPOSITORY_SNAPSHOT = "useResositorySnapshot"; ! public static final String OVERWRITE_REPOSITORY_SNAPSHOT = "overwriteResositorySnapshot"; public static final String REPOSITORY_DEVLIB = "repositoryDevLib"; public static final String REPOSITORY_RUNTIME = "repositoryRuntime"; --- 52,57 ---- public static final String REPOSITORY_TRUNK_METADATA = "trunkMetadata"; public static final String REPOSITORY_SNAPSHOT_METADATA = "snapshotMetadata"; ! public static final String USE_SNAPSHOT = "useSnapshot"; ! public static final String OVERWRITE_SNAPSHOT = "overwriteSnapshot"; public static final String REPOSITORY_DEVLIB = "repositoryDevLib"; public static final String REPOSITORY_RUNTIME = "repositoryRuntime"; |
|
From: Joseph I. <jos...@us...> - 2011-01-11 08:32:46
|
Update of /cvsroot/tolven/pluginFramework/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2572/manifest Modified Files: Tag: V2 tolven-plugin.xml Log Message: Bug to fix the use of the attributes useSnapshot and overwriteSnapshot in the tolven-config/plugins.xml A new kit is available with this change V2.0.26 Index: tolven-plugin.xml =================================================================== RCS file: /cvsroot/tolven/pluginFramework/manifest/tolven-plugin.xml,v retrieving revision 1.11.2.13 retrieving revision 1.11.2.14 diff -C2 -d -r1.11.2.13 -r1.11.2.14 *** tolven-plugin.xml 14 Dec 2010 01:02:48 -0000 1.11.2.13 --- tolven-plugin.xml 11 Jan 2011 08:32:38 -0000 1.11.2.14 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.assembler.pluginframework" version="2.0.25" class="org.tolven.assembler.pluginframework.PluginFrameworkAssembler" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <runtime> <library id="tpfclasses" path="tpf/classes/" type="code" /> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.assembler.pluginframework" version="2.0.26" class="org.tolven.assembler.pluginframework.PluginFrameworkAssembler" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <runtime> <library id="tpfclasses" path="tpf/classes/" type="code" /> |
|
From: Joseph I. <jos...@us...> - 2011-01-09 04:11:07
|
Update of /cvsroot/tolven/tolvenAPI/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17676/manifest Modified Files: Tag: V2 tolven-plugin.xml Log Message: #JIRA-TOLVENCORE-12: on login, the user gets a page that says "exit.html This Page should not be visible" #Occurs when user has previously opted for a default Account Index: tolven-plugin.xml =================================================================== RCS file: /cvsroot/tolven/tolvenAPI/manifest/tolven-plugin.xml,v retrieving revision 1.1.2.28 retrieving revision 1.1.2.29 diff -C2 -d -r1.1.2.28 -r1.1.2.29 *** tolven-plugin.xml 9 Dec 2010 09:45:13 -0000 1.1.2.28 --- tolven-plugin.xml 9 Jan 2011 04:10:58 -0000 1.1.2.29 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.api" version="2.0.27" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.component.war" /> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <plugin id="org.tolven.api" version="2.0.28" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd"> <requires> <import plugin-id="org.tolven.component.war" /> |
|
From: Joseph I. <jos...@us...> - 2011-01-09 04:11:07
|
Update of /cvsroot/tolven/tolvenAPI/api/source/org/tolven/restful In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17676/api/source/org/tolven/restful Modified Files: Tag: V2 VestibuleResources.java Log Message: #JIRA-TOLVENCORE-12: on login, the user gets a page that says "exit.html This Page should not be visible" #Occurs when user has previously opted for a default Account Index: VestibuleResources.java =================================================================== RCS file: /cvsroot/tolven/tolvenAPI/api/source/org/tolven/restful/Attic/VestibuleResources.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** VestibuleResources.java 9 Dec 2010 09:45:13 -0000 1.1.2.5 --- VestibuleResources.java 9 Jan 2011 04:10:59 -0000 1.1.2.6 *************** *** 50,53 **** --- 50,55 ---- public class VestibuleResources { + public static final String DEFAULT_ACCOUNT_HOME = "/private/application.jsf"; + @Context private HttpServletRequest request; *************** *** 112,125 **** mvMap.putSingle(GeneralSecurityFilter.USER_CONTEXT, "vestibule"); AccountUser defaultAccountUser = activationBean.findDefaultAccountUser(user); ! if (defaultAccountUser != null) { ! mvMap.putSingle(GeneralSecurityFilter.VESTIBULE_REDIRECT, "/vestibule/exit.jsf"); ! } ! TolvenSSO.getInstance().setSessionProperty(GeneralSecurityFilter.VESTIBULE_PASS, "true", request); ! TolvenSSO.getInstance().setSessionProperty(GeneralSecurityFilter.USER_CONTEXT, "vestibule", request); ! TolvenSSO.getInstance().updateAccountUserTimestamp(request); ! if (logger.isDebugEnabled()) { ! logger.debug("TOLVEN_PERF: @Path(vestibule/enter): " + (System.currentTimeMillis() - start)); } - return Response.ok(mvMap).build(); } --- 114,129 ---- mvMap.putSingle(GeneralSecurityFilter.USER_CONTEXT, "vestibule"); AccountUser defaultAccountUser = activationBean.findDefaultAccountUser(user); ! if (defaultAccountUser == null) { ! TolvenSSO.getInstance().setSessionProperty(GeneralSecurityFilter.VESTIBULE_PASS, "true", request); ! TolvenSSO.getInstance().setSessionProperty(GeneralSecurityFilter.USER_CONTEXT, "vestibule", request); ! TolvenSSO.getInstance().updateAccountUserTimestamp(request); ! if (logger.isDebugEnabled()) { ! logger.debug("TOLVEN_PERF: @Path(vestibule/enter): " + (System.currentTimeMillis() - start)); ! } ! return Response.ok(mvMap).build(); ! } else { ! TolvenSSO.getInstance().setSessionProperty(GeneralSecurityFilter.PROPOSED_ACCOUNTUSER_ID, Long.toString(defaultAccountUser.getId()), request); ! return exitVestibule(); } } *************** *** 234,238 **** String accountHome = (String) TolvenSSO.getInstance().getSessionProperty(GeneralSecurityFilter.PROPOSED_ACCOUNT_HOME, request); if (accountHome == null || accountHome.length() == 0) { ! accountHome = "/private/application.jsf"; } MultivaluedMap<String, String> mvMap = new MultivaluedMapImpl(); --- 238,242 ---- String accountHome = (String) TolvenSSO.getInstance().getSessionProperty(GeneralSecurityFilter.PROPOSED_ACCOUNT_HOME, request); if (accountHome == null || accountHome.length() == 0) { ! accountHome = DEFAULT_ACCOUNT_HOME; } MultivaluedMap<String, String> mvMap = new MultivaluedMapImpl(); |
|
From: Joseph I. <jos...@us...> - 2011-01-08 02:47:12
|
Update of /cvsroot/tolven/pluginGlassfishPostgresqlConfig/manifest In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10485/manifest Added Files: tolven-plugin.xml lgpl.txt Log Message: First commit to version control config files located on download site --- NEW FILE: lgpl.txt --- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the library's name and a brief idea of what it does.> Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice That's all there is to it! --- NEW FILE: tolven-plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <plugin id="org.tolven.glassfish.postgresql.config" version="2.0.1" vendor="Tolven" xmlns="urn:tolven-org:tpf:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:tpf:1.0 http://tolven.org/xsd/tpf.xsd" /> |
3 messages has been excluded from this view by a project administrator.
