Attachment #92881 for bug #202695

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getType <em>Type</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getRole <em>Role</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}</li>
 * </ul>
 * </p>

 * @model
 * @generated
 */
public interface DPLVariable extends CMNNamedElement, IDatapoolVariable {
	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	void setRole(DPLRole value);

	/**
	 * Returns the value of the '<em><b>Encrypted</b></em>' attribute.
	 * The default value is <code>"false"</code>.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Encrypted</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * <!-- begin-model-doc -->
	 * This boolean specifies whether or not this DPLVariable is encrypted.
	 * <!-- end-model-doc -->
	 * @return the value of the '<em>Encrypted</em>' attribute.
	 * @see #setEncrypted(boolean)
	 * @see org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage#getDPLVariable_Encrypted()
	 * @model default="false"
	 * @generated
	 */
	boolean isEncrypted();

	/**
	 * Sets the value of the '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Encrypted</em>' attribute.
	 * @see #isEncrypted()
	 * @generated
	 */
	void setEncrypted(boolean value);

	/**
	 * Returns the value of the '<em><b>Variables</b></em>' containment reference list.
	 * The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLVariable}.
	 * <!-- begin-user-doc -->

	 */
	EList getVariables();

	
} // DPLVariable




 * <p>
 * The following features are supported:
 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getDatapoolSpec <em>Datapool Spec</em>}</li>
 * </ul>

 * @model
 * @generated
 */
public interface DPLDatapool extends CFGClass, CMNNamedElement, IDatapool {
	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	String copyright = "";

	/**
	 * Returns the value of the '<em><b>Challenge</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * <!-- begin-model-doc -->
	 * This string is used to determine whether a user supplied password for an encrypted datapool is correct.
	 * <!-- end-model-doc -->
	 * @return the value of the '<em>Challenge</em>' attribute.
	 * @see #setChallenge(String)
	 * @see org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage#getDPLDatapool_Challenge()
	 * @model
	 * @generated
	 */
	String getChallenge();

	/**
	 * Sets the value of the '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Challenge</em>' attribute.
	 * @see #getChallenge()
	 * @generated
	 */
	void setChallenge(String value);

	/**
	 * Returns the value of the '<em><b>Equivalence Classes</b></em>' containment reference list.
	 * The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLEquivalenceClass}.
	 * <!-- begin-user-doc -->

	 */
	void setDatapoolSpec(DPLDatapoolSpec value);

	
} // DPLDatapool




	int DPL_VARIABLE__ROLE = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 1;

	/**
	 * The feature id for the '<em><b>Encrypted</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_VARIABLE__ENCRYPTED = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Variables</b></em>' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The number of structural features of the '<em>DPL Variable</em>' class.

	 * @generated
	 * @ordered
	 */
	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Id</b></em>' attribute.

	int DPL_DATAPOOL__INSTANTIATIONS = Common_ConfigurationPackage.CFG_CLASS__INSTANTIATIONS;

	/**
	 * The feature id for the '<em><b>Challenge</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL__CHALLENGE = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;

	/**
	 * The feature id for the '<em><b>Equivalence Classes</b></em>' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;

	/**
	 * The feature id for the '<em><b>Datapool Spec</b></em>' containment reference.

	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;

	/**
	 * The number of structural features of the '<em>DPL Datapool</em>' class.

	 * @generated
	 * @ordered
	 */
	int DPL_DATAPOOL_FEATURE_COUNT = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 3;

	/**
	 * The meta object id for the '{@link org.eclipse.hyades.models.common.datapool.DPLRole <em>DPL Role</em>}' enum.

	EClass getDPLDatapool();

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Challenge</em>'.
	 * @see org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge()
	 * @see #getDPLDatapool()
	 * @generated
	 */
	EAttribute getDPLDatapool_Challenge();

	/**
	 * Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	EAttribute getDPLVariable_Role();

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Encrypted</em>'.
	 * @see org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted()
	 * @see #getDPLVariable()
	 * @generated
	 */
	EAttribute getDPLVariable_Encrypted();

	/**
	 * Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

		EAttribute DPL_VARIABLE__ROLE = eINSTANCE.getDPLVariable_Role();

		/**
		 * The meta object literal for the '<em><b>Encrypted</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		EAttribute DPL_VARIABLE__ENCRYPTED = eINSTANCE.getDPLVariable_Encrypted();

		/**
		 * The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->

		EClass DPL_DATAPOOL = eINSTANCE.getDPLDatapool();

		/**
		 * The meta object literal for the '<em><b>Challenge</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		EAttribute DPL_DATAPOOL__CHALLENGE = eINSTANCE.getDPLDatapool_Challenge();

		/**
		 * The meta object literal for the '<em><b>Equivalence Classes</b></em>' containment reference list feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->

Lines 227-234 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/impl/Common_DatapoolPackageImpl.java (-3 / +25 lines)
227	* <!-- end-user-doc -->	227	* <!-- end-user-doc -->
228	* @generated	228	* @generated
229	*/	229	*/
		230	public EAttribute getDPLDatapool_Challenge() {
		231	return (EAttribute)dplDatapoolEClass.getEStructuralFeatures().get(0);
		232	}
		233
		234	/**
		235	* <!-- begin-user-doc -->
		236	* <!-- end-user-doc -->
		237	* @generated
		238	*/
230	public EReference getDPLDatapool_EquivalenceClasses() {	239	public EReference getDPLDatapool_EquivalenceClasses() {
231	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(0);	240	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);
232	}	241	}
233		242
234	/**	243	/**
Lines 237-243 Link Here
237	* @generated	246	* @generated
238	*/	247	*/
239	public EReference getDPLDatapool_DatapoolSpec() {	248	public EReference getDPLDatapool_DatapoolSpec() {
240	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(1);	249	return (EReference)dplDatapoolEClass.getEStructuralFeatures().get(2);
241	}	250	}
242		251
243	/**	252	/**
Lines 344-351 Link Here
344	* <!-- end-user-doc -->	353	* <!-- end-user-doc -->
345	* @generated	354	* @generated
346	*/	355	*/
		356	public EAttribute getDPLVariable_Encrypted() {
		357	return (EAttribute)dplVariableEClass.getEStructuralFeatures().get(2);
		358	}
		359
		360	/**
		361	* <!-- begin-user-doc -->
		362	* <!-- end-user-doc -->
		363	* @generated
		364	*/
347	public EReference getDPLVariable_Variables() {	365	public EReference getDPLVariable_Variables() {
348	return (EReference)dplVariableEClass.getEStructuralFeatures().get(2);	366	return (EReference)dplVariableEClass.getEStructuralFeatures().get(3);
349	}	367	}
350		368
351	/**	369	/**
Lines 402-410 Link Here
402	dplVariableEClass = createEClass(DPL_VARIABLE);	420	dplVariableEClass = createEClass(DPL_VARIABLE);
403	createEAttribute(dplVariableEClass, DPL_VARIABLE__TYPE);	421	createEAttribute(dplVariableEClass, DPL_VARIABLE__TYPE);
404	createEAttribute(dplVariableEClass, DPL_VARIABLE__ROLE);	422	createEAttribute(dplVariableEClass, DPL_VARIABLE__ROLE);
		423	createEAttribute(dplVariableEClass, DPL_VARIABLE__ENCRYPTED);
405	createEReference(dplVariableEClass, DPL_VARIABLE__VARIABLES);	424	createEReference(dplVariableEClass, DPL_VARIABLE__VARIABLES);
406		425
407	dplDatapoolEClass = createEClass(DPL_DATAPOOL);	426	dplDatapoolEClass = createEClass(DPL_DATAPOOL);
		427	createEAttribute(dplDatapoolEClass, DPL_DATAPOOL__CHALLENGE);
408	createEReference(dplDatapoolEClass, DPL_DATAPOOL__EQUIVALENCE_CLASSES);	428	createEReference(dplDatapoolEClass, DPL_DATAPOOL__EQUIVALENCE_CLASSES);
409	createEReference(dplDatapoolEClass, DPL_DATAPOOL__DATAPOOL_SPEC);	429	createEReference(dplDatapoolEClass, DPL_DATAPOOL__DATAPOOL_SPEC);
410		430
Lines 464-472 Link Here
464	initEClass(dplVariableEClass, DPLVariable.class, "DPLVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);	484	initEClass(dplVariableEClass, DPLVariable.class, "DPLVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
465	initEAttribute(getDPLVariable_Type(), ecorePackage.getEString(), "type", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	485	initEAttribute(getDPLVariable_Type(), ecorePackage.getEString(), "type", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
466	initEAttribute(getDPLVariable_Role(), this.getDPLRole(), "role", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	486	initEAttribute(getDPLVariable_Role(), this.getDPLRole(), "role", null, 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
		487	initEAttribute(getDPLVariable_Encrypted(), ecorePackage.getEBoolean(), "encrypted", "false", 0, 1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
467	initEReference(getDPLVariable_Variables(), this.getDPLVariable(), null, "variables", null, 0, -1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	488	initEReference(getDPLVariable_Variables(), this.getDPLVariable(), null, "variables", null, 0, -1, DPLVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
468		489
469	initEClass(dplDatapoolEClass, DPLDatapool.class, "DPLDatapool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);	490	initEClass(dplDatapoolEClass, DPLDatapool.class, "DPLDatapool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
		491	initEAttribute(getDPLDatapool_Challenge(), ecorePackage.getEString(), "challenge", null, 0, 1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
470	initEReference(getDPLDatapool_EquivalenceClasses(), this.getDPLEquivalenceClass(), null, "equivalenceClasses", null, 0, -1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	492	initEReference(getDPLDatapool_EquivalenceClasses(), this.getDPLEquivalenceClass(), null, "equivalenceClasses", null, 0, -1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
471	initEReference(getDPLDatapool_DatapoolSpec(), this.getDPLDatapoolSpec(), null, "datapoolSpec", null, 1, 1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);	493	initEReference(getDPLDatapool_DatapoolSpec(), this.getDPLDatapoolSpec(), null, "datapoolSpec", null, 1, 1, DPLDatapool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
472		494

Lines 16-21 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/impl/DPLCellImpl.java (-10 / +33 lines)
16		16
17	package org.eclipse.hyades.models.common.datapool.impl;	17	package org.eclipse.hyades.models.common.datapool.impl;
18		18
		19	import java.util.HashMap;
		20
19	import org.eclipse.emf.common.notify.Notification;	21	import org.eclipse.emf.common.notify.Notification;
20	import org.eclipse.emf.ecore.EClass;	22	import org.eclipse.emf.ecore.EClass;
21	import org.eclipse.emf.ecore.InternalEObject;	23	import org.eclipse.emf.ecore.InternalEObject;
Lines 28-34 Link Here
28	import org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage;	30	import org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage;
29	import org.eclipse.hyades.models.common.datapool.DPLCell;	31	import org.eclipse.hyades.models.common.datapool.DPLCell;
30	import org.eclipse.hyades.models.common.datapool.DPLVariable;	32	import org.eclipse.hyades.models.common.datapool.DPLVariable;
		33	import org.eclipse.hyades.models.common.datapool.util.DPLPasswordCollection;
31	import org.eclipse.hyades.models.common.util.DatapoolUtil;	34	import org.eclipse.hyades.models.common.util.DatapoolUtil;
		35	import org.eclipse.hyades.models.common.util.EncryptionManager;
32	import org.eclipse.hyades.models.common.util.XMLParserUtil;	36	import org.eclipse.hyades.models.common.util.XMLParserUtil;
33	import org.w3c.dom.Document;	37	import org.w3c.dom.Document;
34		38
Lines 361-367 Link Here
361	{	365	{
362	Object cellValue = this.getCellValue();	366	Object cellValue = this.getCellValue();
363	if(cellValue != null)	367	if(cellValue != null)
364	return cellValue.toString();	368	return decryptValue(cellValue.toString());
365	else	369	else
366	return new String();	370	return new String();
367	}	371	}
Lines 376-382 Link Here
376	*/	380	*/
377	public long getLongValue()	381	public long getLongValue()
378	{	382	{
379	return Long.parseLong((String)this.getCellValue());	383	return Long.parseLong(decryptValue((String)this.getCellValue()));
380	}	384	}
381		385
382	/**	386	/**
Lines 389-395 Link Here
389	*/	393	*/
390	public int getIntValue()	394	public int getIntValue()
391	{	395	{
392	return Integer.parseInt((String)this.getCellValue());	396	return Integer.parseInt(decryptValue((String)this.getCellValue()));
393	}	397	}
394		398
395	/**	399	/**
Lines 402-408 Link Here
402	*/	406	*/
403	public short getShortValue()	407	public short getShortValue()
404	{	408	{
405	return Short.parseShort((String)this.getCellValue());	409	return Short.parseShort(decryptValue((String)this.getCellValue()));
406	}	410	}
407		411
408	/**	412	/**
Lines 415-421 Link Here
415	*/	419	*/
416	public byte getByteValue()	420	public byte getByteValue()
417	{	421	{
418	return Byte.parseByte((String)this.getCellValue());	422	return Byte.parseByte(decryptValue((String)this.getCellValue()));
419	}	423	}
420		424
421	/**	425	/**
Lines 428-434 Link Here
428	*/	432	*/
429	public double getDoubleValue()	433	public double getDoubleValue()
430	{	434	{
431	return Double.parseDouble((String)this.getCellValue());	435	return Double.parseDouble(decryptValue((String)this.getCellValue()));
432	}	436	}
433		437
434	/**	438	/**
Lines 441-447 Link Here
441	*/	445	*/
442	public float getFloatValue()	446	public float getFloatValue()
443	{	447	{
444	return Float.parseFloat((String)this.getCellValue());	448	return Float.parseFloat(decryptValue((String)this.getCellValue()));
445	}	449	}
446		450
447	/**	451	/**
Lines 454-460 Link Here
454	*/	458	*/
455	public boolean getBooleanValue()	459	public boolean getBooleanValue()
456	{	460	{
457	return Boolean.getBoolean ((String)this.getCellValue());	461	return Boolean.getBoolean (decryptValue((String)this.getCellValue()));
458	}	462	}
459		463
460	/**	464	/**
Lines 468-474 Link Here
468	*/	472	*/
469	public char getCharValue()	473	public char getCharValue()
470	{	474	{
471	return ((String)this.getCellValue()).charAt(0);	475	return decryptValue(((String)this.getCellValue())).charAt(0);
472	}	476	}
473		477
474	/**	478	/**
Lines 504-510 Link Here
504	{	508	{
505	//get the tag and value from the XML fragment	509	//get the tag and value from the XML fragment
506	try {	510	try {
507	Document doc = XMLParserUtil.parse(value.toString());	511	Document doc = XMLParserUtil.parse(value.toString());
508	tag = doc.getFirstChild().getNodeName();	512	tag = doc.getFirstChild().getNodeName();
509	val = doc.getFirstChild().getFirstChild().getNodeValue();	513	val = doc.getFirstChild().getFirstChild().getNodeValue();
510	}	514	}
Lines 569-572 Link Here
569	else	573	else
570	return START_LITERAL + END_LITERAL;	574	return START_LITERAL + END_LITERAL;
571	}	575	}
		576	/*
		577	* decryptValue the cell value
		578	*/
		579	public String decryptValue(String value){
		580	String result = null;
		581	if(value == null)
		582	return result;
		583
		584	result = value;
		585	HashMap passes = DPLPasswordCollection.getInstance().getDatapoolPassword();
		586	String dpName = this.getCellRecord().getEquivalenceClass().getDatapool().getName();
		587	if(passes!=null && passes.size()>0 && dpName != null && this.getVariable().isEncrypted()){
		588	String pass = (String)passes.get(dpName);
		589	if(pass != null){
		590	result = EncryptionManager.decrypt(value, pass);
		591	}
		592	}
		593	return result;
		594	}
572	} //DPLCellImpl	595	} //DPLCellImpl




 * Contributors:
 * IBM - Initial API and implementation
 *
 * $Id: DPLVariableImpl.java,v 1.9 2008/02/28 18:24:31 huangxy Exp $
 **********************************************************************/
 
/*

 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getType <em>Type</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getRole <em>Role</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#isEncrypted <em>Encrypted</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl#getVariables <em>Variables</em>}</li>
 * </ul>
 * </p>

	protected DPLRole role = ROLE_EDEFAULT;

	/**
	 * The default value of the '{@link #isEncrypted() <em>Encrypted</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #isEncrypted()
	 * @generated
	 * @ordered
	 */
	protected static final boolean ENCRYPTED_EDEFAULT = false;

	/**
	 * The cached value of the '{@link #isEncrypted() <em>Encrypted</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #isEncrypted()
	 * @generated
	 * @ordered
	 */
	protected boolean encrypted = ENCRYPTED_EDEFAULT;

	/**
	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public boolean isEncrypted() {
		return encrypted;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setEncrypted(boolean newEncrypted) {
		boolean oldEncrypted = encrypted;
		encrypted = newEncrypted;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED, oldEncrypted, encrypted));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EList getVariables() {
		if (variables == null) {
			variables = new EObjectContainmentEList(DPLVariable.class, this, Common_DatapoolPackage.DPL_VARIABLE__VARIABLES);

				return getType();
			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
				return getRole();
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
				return isEncrypted() ? Boolean.TRUE : Boolean.FALSE;
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				return getVariables();
		}

			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
				setRole((DPLRole)newValue);
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
				setEncrypted(((Boolean)newValue).booleanValue());
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				getVariables().clear();
				getVariables().addAll((Collection)newValue);

			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
				setRole(ROLE_EDEFAULT);
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
				setEncrypted(ENCRYPTED_EDEFAULT);
				return;
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				getVariables().clear();
				return;

			case Common_DatapoolPackage.DPL_VARIABLE__TYPE:
				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
			case Common_DatapoolPackage.DPL_VARIABLE__ROLE:
       		
				return role != ROLE_EDEFAULT;
	        
			case Common_DatapoolPackage.DPL_VARIABLE__ENCRYPTED:
       		
				return encrypted != ENCRYPTED_EDEFAULT;
	        
			case Common_DatapoolPackage.DPL_VARIABLE__VARIABLES:
				return variables != null && !variables.isEmpty();
		}

		result.append(type);
		result.append(", role: ");
		result.append(role);
		result.append(", encrypted: ");
		result.append(encrypted);
		result.append(')');
		return result.toString();
	}

	
	//Beginning of non-generated classes
	
	//org.eclipse.hyades.edit.datapool.IDatapoolVariable methods




 * <p>
 * The following features are implemented:
 * <ul>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getChallenge <em>Challenge</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getEquivalenceClasses <em>Equivalence Classes</em>}</li>
 *   <li>{@link org.eclipse.hyades.models.common.datapool.impl.DPLDatapoolImpl#getDatapoolSpec <em>Datapool Spec</em>}</li>
 * </ul>

	public static final String copyright = "";

	/**
	 * The default value of the '{@link #getChallenge() <em>Challenge</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getChallenge()
	 * @generated
	 * @ordered
	 */
	protected static final String CHALLENGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getChallenge() <em>Challenge</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getChallenge()
	 * @generated
	 * @ordered
	 */
	protected String challenge = CHALLENGE_EDEFAULT;

	/**
	 * The cached value of the '{@link #getEquivalenceClasses() <em>Equivalence Classes</em>}' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getChallenge() {
		return challenge;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setChallenge(String newChallenge) {
		String oldChallenge = challenge;
		challenge = newChallenge;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE, oldChallenge, challenge));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EList getEquivalenceClasses() {
		if (equivalenceClasses == null) {
			equivalenceClasses = new EObjectContainmentEList(DPLEquivalenceClass.class, this, Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES);

	 */
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				return getChallenge();
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				return getEquivalenceClasses();
			case Common_DatapoolPackage.DPL_DATAPOOL__DATAPOOL_SPEC:

	 */
	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				setChallenge((String)newValue);
				return;
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				getEquivalenceClasses().clear();
				getEquivalenceClasses().addAll((Collection)newValue);

	 */
	public void eUnset(int featureID) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				setChallenge(CHALLENGE_EDEFAULT);
				return;
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				getEquivalenceClasses().clear();
				return;

	 */
	public boolean eIsSet(int featureID) {
		switch (featureID) {
			case Common_DatapoolPackage.DPL_DATAPOOL__CHALLENGE:
				return CHALLENGE_EDEFAULT == null ? challenge != null : !CHALLENGE_EDEFAULT.equals(challenge);
			case Common_DatapoolPackage.DPL_DATAPOOL__EQUIVALENCE_CLASSES:
				return equivalenceClasses != null && !equivalenceClasses.isEmpty();
			case Common_DatapoolPackage.DPL_DATAPOOL__DATAPOOL_SPEC:

		return super.eIsSet(featureID);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String toString() {
		if (eIsProxy()) return super.toString();

		StringBuffer result = new StringBuffer(super.toString());
		result.append(" (challenge: ");
		result.append(challenge);
		result.append(')');
		return result.toString();
	}

	
	/* (non-Javadoc)
	 * @see org.eclipse.hyades.models.common.configuration.impl.CFGClassImpl#getLocation()
	 */




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolEncryptManager.java,v 1.0 2008/02/28 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.models.common.datapool.util;

import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.edit.datapool.IDatapoolCell;
import org.eclipse.hyades.edit.datapool.IDatapoolRecord;
import org.eclipse.hyades.execution.runtime.datapool.IDatapoolEquivalenceClass;
import org.eclipse.hyades.execution.runtime.datapool.IDatapoolVariable;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.datapool.DPLVariable;
import org.eclipse.hyades.models.common.util.EncryptionManager;
import org.eclipse.hyades.models.plugin.ModelsPlugin;

/**
 * It's used to provide functions of encryption for a datapool .
 * 
 * @author Huang Xin Ying 
 * @version February ,28
 */
public class DatapoolEncryptManager {
	
    /**
     * Used to encrypt the variable in the datapool using password
     * @param varible
     * @param key
     * @param datapool
     */
	public static void encryptedCellInVarible(IDatapoolVariable varible,
			String key, IDatapool datapool) {

		int index = datapool.getDefaultEquivalenceClassIndex();
		if (index == -1) {

			return;
		}
		IDatapoolEquivalenceClass equivalenceClass = datapool
				.getEquivalenceClass(index);
		
		for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
			IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
					.getRecord(i);			
			for (int k = 0; k < record.getCellCount(); k++) {
				IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
				if (cell.getCellVariable().getId().equals(varible.getId())) {
					cell.setCellValue(EncryptionManager.encrypt(cell.getStringValue(),
							key));
				}
			}
		}
	}

	/**
	 * Decrypt selected variable in the datapool using key
	 * @param varible
	 * @param key
	 * @param datapool
	 */
	public static void decryptedCellInVarible(IDatapoolVariable variable,
			String key, IDatapool datapool) {
		int index = datapool.getDefaultEquivalenceClassIndex();
		if (index == -1) {
			return;
		}
		IDatapoolEquivalenceClass equivalenceClass = datapool
				.getEquivalenceClass(index);

		for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
			IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
					.getRecord(i);			
			for (int k = 0; k < record.getCellCount(); k++) {
				IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
				if (cell.getCellVariable().getId().equals(variable.getId())) {
					cell.setCellValue(EncryptionManager.decrypt(cell.getStringValue(),
							key));
				}
			}
		}
	}

	/**
	 * Change key for encrypted datapool;
	 * Decrypt variables in datapool using old key ,then encrypt them using new key 
	 * @param newKey
	 * @param datapool
	 */
	public static void changeKey(String newKey, IDatapool datapool) {
		if (!(datapool instanceof DPLDatapool))
			return;
		if (newKey == null || newKey.equals(""))
			((DPLDatapool) datapool).setChallenge(null);
		else
			((DPLDatapool) datapool).setChallenge(newKey);
	}

	/**
	 * Update encrypted variables using new key 
	 * @param datapool
	 * @param oldKey
	 * @param newKey
	 */
	public static void changeKeyOfEncryptedCell(IDatapool datapool, String oldKey,
			String newKey) {
		int variableCount = datapool.getVariableCount();
		IDatapoolVariable variable = null;
		for (int i = 0; i < variableCount; i++) {
			variable = datapool.getVariable(i);
			if (isVariabelEncrypted(variable)) {
				decryptedCellInVarible(variable, oldKey, datapool);
				encryptedCellInVarible(variable, newKey, datapool);
			}
		}
	}
	
	/**
	 * Decrypt datapool's variables into unencrypted 
	 * @param datapool
	 * @param key
	 */
	public static void decryptDatapool(IDatapool datapool, String key){
		int variableCount = datapool.getVariableCount();
		IDatapoolVariable variable = null;
		for (int i = 0; i < variableCount; i++) {
			variable = datapool.getVariable(i);
			if (isVariabelEncrypted(variable)) {
				decryptedCellInVarible(variable, key, datapool);				
			}
		}
	}
	
	/**
	 * Encrypt datapool using assigned key 
	 * @param datapool
	 * @param key
	 */
	public static void encryptDatapool(IDatapool datapool, String key){
		int variableCount = datapool.getVariableCount();
		IDatapoolVariable variable = null;
		for (int i = 0; i < variableCount; i++) {
			variable = datapool.getVariable(i);
			if (isVariabelEncrypted(variable)) {
				encryptedCellInVarible(variable, key, datapool);			
			}
		}
	}

	public static boolean isDatapoolEncrypted(IDatapool datapool) {
		if (!(datapool instanceof DPLDatapool))
			return false;

		if (((DPLDatapool) datapool).getChallenge() == null
				|| ((DPLDatapool) datapool).getChallenge().equals(""))
			return false;
		return true;
	}

	public static boolean isKeyCorrect(IDatapool datapool, String key) {
		if (!(datapool instanceof DPLDatapool))
			return false;
		if (key == null)
			return false;
		boolean flag = false;
		try {
			flag = EncryptionManager.EncoderByMd5(key).equals(
					((DPLDatapool) datapool).getChallenge());
		} catch (Exception e) {
			ModelsPlugin.getPlugin().log("invalid key exception occurs");
			ModelsPlugin.getPlugin().log(e);
		}
		return flag;

	}

	public static boolean isVariabelEncrypted(IDatapoolVariable varible) {
		return (varible instanceof DPLVariable) ? ((DPLVariable) varible)
				.isEncrypted() : false;
	}

	public static String encrypt(String content, String pass) {
		return EncryptionManager.encrypt(content, pass);
	}

	public static String decrypt(String content, String pass) {
		return EncryptionManager.decrypt(content, pass);
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DPLPasswordCollection.java,v 1.0 2008/02/28 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.models.common.datapool.util;

import java.util.HashMap;

/**
 * It's used to save HashMap of datapools and passwords for the test 
 * during executing a test in agent controller side .
 * 
 * @author Huang Xin Ying 
 * @version February ,28
 */
public class DPLPasswordCollection {
	private static DPLPasswordCollection instance = null;

	private HashMap datapoolPassword = new HashMap();

	private DPLPasswordCollection() {
	}

	/**
	 * Get the only instance of this single skeleton class 
	 * @return DPLPasswordCollection
	 */
	public static DPLPasswordCollection getInstance() {
		if (instance == null) {
			instance = new DPLPasswordCollection();
		} 
		return instance;
	}

	/**
	 * Get datapool passwords from this class
	 * @return HashMap
	 */
	public HashMap getDatapoolPassword() {
		return datapoolPassword;
	}

	/**
	 * Save datapool password hashMap into this class
	 * @param datapoolPassword
	 */
	public void setDatapoolPassword(HashMap datapoolPassword) {
		this.datapoolPassword = datapoolPassword;
	}
	
	/**
	 * clear this hashMap after finish test suite execution 
	 */
	public void clear(){
		this.datapoolPassword.clear();
	}	
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: EncryptionManager.java,v 1.0 2008/02/28 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.models.common.util;

import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;


/**
 * It's used to provide encryption and decryption algorithm for a datapool .
 * 
 * @author Huang Xin Ying 
 * @verion February ,28 
 */
public class EncryptionManager {
    
	/**
	 * Encrypt input String using RC4 algorithm  
	 * @param content
	 * @param pass
	 * @return
	 */
	public static String encrypt(String content, String pass) {		
		return new RC4Encrypter().cipherMessage(pass, content);
	}

	/**
	 * Decrypt input String using RC4 algorithm 
	 * @param content
	 * @param pass
	 * @return
	 */
	public static String decrypt(String content, String pass) {		
		return new RC4Encrypter().decipherMessage(pass, content);
	}
    
	/**
	 * Encode input String using MD5 algorithm
	 * @param str
	 * @return
	 * @throws NoSuchAlgorithmException
	 * @throws UnsupportedEncodingException
	 */
	public static String EncoderByMd5(String str)
			throws NoSuchAlgorithmException, UnsupportedEncodingException {
		if (str == null)
			return null;
		
		return new RC4Encrypter().byteArrayToHexString(MessageDigest.getInstance("MD5").digest(str.getBytes()));
	}

	public static class RC4Encrypter {
		
		public static final String[] HEXARRAY = {
	        "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"
	    };

		public String cipherMessage(String pass, String content) {
			if (pass == null || pass.equals("") || content == null
					|| content.equals("")) {
				return content;
			}
			try {
				SecretKeySpec key = this.generateKey(pass);
				Cipher cipher = Cipher.getInstance("RC4");
				cipher.init(Cipher.ENCRYPT_MODE, key);
				byte[] code = cipher.update(content.getBytes());
				return byteArrayToHexString(code);
			} catch (Throwable t) {
				  t.printStackTrace();
			}
			return null;
		}

		public String decipherMessage(String pass, String encryptStr)

		{
			if (pass == null || pass.equals("") || encryptStr == null
					|| encryptStr.equals("")) {
				return encryptStr;
			}
			try {
				SecretKeySpec key = this.generateKey(pass);
				Cipher cipher = Cipher.getInstance("RC4");
				cipher.init(Cipher.DECRYPT_MODE, key);
				byte[] text = hexStringToByteArray(encryptStr);
				byte[] code = cipher.update(text);
				return new String(code);
			} catch (Throwable t) {
				  t.printStackTrace();
			}
			return null;
		}

		private SecretKeySpec generateKey(String inpass)

		{
			try {
				byte[] pass = inpass.getBytes();

				MessageDigest md5 = MessageDigest.getInstance("MD5");

				md5.update(pass);
				byte temp[] = md5.digest();

				SecretKeySpec key = new SecretKeySpec(temp, "RC4");
				return key;

			} catch (Throwable t) {
				  t.printStackTrace();
			}
			return null;
		}
		
		/**
	      * Method converting byte array into String.
	      *
	      * @param The byte array to be converted.
	      * @return A <code>String[]</code> containing String value of byte array.
	      */
	     public  String byteArrayToHexString(byte[] bytes){
	      
	         String result = "";
	          for (int i = 0; i < bytes.length; i++){
	            //the up 4 bits
	            int tmp = bytes[i] >>> 4;
	            result += HEXARRAY[tmp % 16];
	            //the lower 4 bits
	            tmp = bytes[i] & 0x0f;
	              result += HEXARRAY[tmp % 16];
	           }
	         
	           return result;
	           
	     }
	    
	     /**
	      * Method converting String into byte[].
	      *
	      * @param The String to be converted.
	      * @return A <code>byte[]</code> containing byte[] value of string.
	      */ 
	    public  byte[] hexStringToByteArray(String hex){
	        
	    	byte[] bytes = new byte[hex.length() / 2];
	         for (int i = 0; i < bytes.length; i++){
	              bytes[i] = (byte) Integer.parseInt(hex.substring(2*i, 2*i+2), 16);
	         }
	           
	       
	        return bytes;
	        
	        
	    }		
	}	
}

Lines 4-10 Link Here

(-)src/org/eclipse/hyades/test/ui/datapool/internal/dialog/DatapoolColumnDialog.java (-17 / +191 lines)
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: DatapoolColumnDialog.java,v 1.15 2008/01/21 19:09:15 paules Exp $	7	* $Id: DatapoolColumnDialog.java,v 1.15 2008/02/27 19:09:15 huangxy Exp $
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
Lines 14-31 Link Here
14		14
15	import org.eclipse.hyades.edit.datapool.IDatapool;	15	import org.eclipse.hyades.edit.datapool.IDatapool;
16	import org.eclipse.hyades.edit.datapool.IDatapoolVariable;	16	import org.eclipse.hyades.edit.datapool.IDatapoolVariable;
		17	import org.eclipse.hyades.models.common.datapool.DPLVariable;
		18	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
		19	import org.eclipse.hyades.models.common.util.EncryptionManager;
17	import org.eclipse.hyades.test.ui.datapool.internal.util.DatapoolUtil;	20	import org.eclipse.hyades.test.ui.datapool.internal.util.DatapoolUtil;
18	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;	21	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
19	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;	22	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
		23	import org.eclipse.jface.dialogs.IDialogConstants;
		24	import org.eclipse.jface.dialogs.MessageDialog;
20	import org.eclipse.osgi.util.NLS;	25	import org.eclipse.osgi.util.NLS;
21	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
22	import org.eclipse.swt.events.KeyEvent;	27	import org.eclipse.swt.events.KeyEvent;
23	import org.eclipse.swt.events.KeyListener;	28	import org.eclipse.swt.events.KeyListener;
		29	import org.eclipse.swt.events.MouseEvent;
		30	import org.eclipse.swt.events.MouseListener;
24	import org.eclipse.swt.events.SelectionEvent;	31	import org.eclipse.swt.events.SelectionEvent;
25	import org.eclipse.swt.events.SelectionListener;	32	import org.eclipse.swt.events.SelectionListener;
26	import org.eclipse.swt.graphics.Color;	33	import org.eclipse.swt.graphics.Color;
27	import org.eclipse.swt.layout.GridData;	34	import org.eclipse.swt.layout.GridData;
28	import org.eclipse.swt.layout.GridLayout;	35	import org.eclipse.swt.layout.GridLayout;
		36	import org.eclipse.swt.widgets.Button;
29	import org.eclipse.swt.widgets.Combo;	37	import org.eclipse.swt.widgets.Combo;
30	import org.eclipse.swt.widgets.Composite;	38	import org.eclipse.swt.widgets.Composite;
31	import org.eclipse.swt.widgets.Control;	39	import org.eclipse.swt.widgets.Control;
Lines 43-49 Link Here
43	* @author psun	51	* @author psun
44	*	52	*
45	*/	53	*/
46	public class DatapoolColumnDialog extends DatapoolBaseDialog implements KeyListener, SelectionListener{	54	public class DatapoolColumnDialog extends DatapoolBaseDialog implements KeyListener, SelectionListener,MouseListener{
47		55
48	private static final String TAG_VARIABLES = "variables"; //$NON-NLS-1$	56	private static final String TAG_VARIABLES = "variables"; //$NON-NLS-1$
49		57
Lines 64-71 Link Here
64	private String type = new String();	72	private String type = new String();
65	private String insertionVariableID = null;	73	private String insertionVariableID = null;
66	private String insertionVariableName = null;	74	private String insertionVariableName = null;
67	private int defaultNameCounter = 1;	75	private int defaultNameCounter = 1;
		76	private Button checkBox;
		77	private Button changeKeyButton;
		78	private boolean isEncrypted;
		79	private boolean isKeyChanged = false;
		80	private String newKey;
68		81
		82	public boolean isKeyChanged() {
		83	return isKeyChanged;
		84	}
69	public DatapoolColumnDialog(Shell parentShell,	85	public DatapoolColumnDialog(Shell parentShell,
70	IDatapool datapool,	86	IDatapool datapool,
71	IDatapoolVariable selectedVariable,	87	IDatapoolVariable selectedVariable,
Lines 77-83 Link Here
77	this.datapool = datapool;	93	this.datapool = datapool;
78	this.title = title;	94	this.title = title;
79	this.selectedVariable = selectedVariable;	95	this.selectedVariable = selectedVariable;
80	this.previousVariable = previousVariable;	96	this.previousVariable = previousVariable;
81	}	97	}
82		98
83	/**	99	/**
Lines 122-127 Link Here
122	typeField.setLayoutData(gridData);	138	typeField.setLayoutData(gridData);
123	typeField.addKeyListener(this);	139	typeField.addKeyListener(this);
124	typeFieldForeground = typeField.getForeground();	140	typeFieldForeground = typeField.getForeground();
		141
125		142
126	IDatapoolVariable[] variables = DatapoolUtil.getInstance().getVariables(datapool, null);	143	IDatapoolVariable[] variables = DatapoolUtil.getInstance().getVariables(datapool, null);
127	if(selectedVariable != null)	144	if(selectedVariable != null)
Lines 156-162 Link Here
156	else {	173	else {
157	insertionLabel.setText(UiPluginResourceBundle.DATA_DLG_MOVE);	174	insertionLabel.setText(UiPluginResourceBundle.DATA_DLG_MOVE);
158	}	175	}
159		176
160	insertionVariables = new Combo(superComposite, SWT.DROP_DOWN \| SWT.READ_ONLY);	177	insertionVariables = new Combo(superComposite, SWT.DROP_DOWN \| SWT.READ_ONLY);
161	insertionVariables.setItems(variableLabels);	178	insertionVariables.setItems(variableLabels);
162	insertionVariables.setData(TAG_VARIABLES, variables);	179	insertionVariables.setData(TAG_VARIABLES, variables);
Lines 165-171 Link Here
165		182
166	if(variables.length > 0 && previousVariable != null)	183	if(variables.length > 0 && previousVariable != null)
167	{	184	{
168	int selectIndex = findVariableIndexInCombo(variables, previousVariable) - 1;	185	int selectIndex = findVariableIndexInCombo(variables, previousVariable);
169	if (selectIndex < 0) {	186	if (selectIndex < 0) {
170	insertionVariables.select(0);	187	insertionVariables.select(0);
171	insertionVariableName = new String();	188	insertionVariableName = new String();
Lines 184-211 Link Here
184	}	201	}
185	if (title.equals(UiPluginResourceBundle.DATA_COL_DLG_TITLE_EDIT) && variables.length == 1) {	202	if (title.equals(UiPluginResourceBundle.DATA_COL_DLG_TITLE_EDIT) && variables.length == 1) {
186	//- Move field hidden	203	//- Move field hidden
187	insertionVariables.setVisible(false);	204	insertionVariables.setVisible(false);
188	insertionLabel.setVisible(false);	205	insertionLabel.setVisible(false);
189	}	206	}
		207
		208	checkBox = new Button(superComposite,SWT.CHECK);
		209	checkBox.setText(UiPluginResourceBundle.DatapoolDialog_ENCRYPTED);
		210	checkBox.addMouseListener(this);
		211	changeKeyButton = new Button(superComposite,SWT.NONE);
		212	changeKeyButton.setText(UiPluginResourceBundle.DatapoolDialog_CHANGEKEY);
		213	changeKeyButton.addMouseListener(this);
		214	if(isVariabelEncrypted(selectedVariable))
		215	{
		216	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		217	changeKeyButton.setEnabled(true);
		218	checkBox.setSelection(true);
		219	isEncrypted =true;
		220	}
		221	else
		222	{
		223	changeKeyButton.setEnabled(false);
		224	checkBox.setSelection(false);
		225	isEncrypted = false;
		226	}
		227
190	nameErrorLabel = new Label(superComposite, SWT.NONE);	228	nameErrorLabel = new Label(superComposite, SWT.NONE);
191	// set text to error labels in order to get the proper layout.	229	// set text to error labels in order to get the proper layout.
192	nameErrorLabel.setText(UiPluginResourceBundle.DATA_DLG_ERROR_INDICATOR +	230	nameErrorLabel.setText(UiPluginResourceBundle.DATA_DLG_ERROR_INDICATOR +
193	UiPluginResourceBundle.DATA_COL_DLG_ERROR_NAME_NOT_VALID);	231	UiPluginResourceBundle.DATA_COL_DLG_ERROR_NAME_NOT_VALID);
194	gridData = new GridData(GridData.FILL_HORIZONTAL);	232	gridData = new GridData(GridData.FILL_HORIZONTAL);
195	gridData.horizontalSpan = 2;	233	gridData.horizontalSpan = 2;
196	nameErrorLabel.setLayoutData(gridData);	234	nameErrorLabel.setLayoutData(gridData);
197	nameErrorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));	235	nameErrorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
198	nameErrorLabel.setVisible(false);	236	nameErrorLabel.setVisible(false);
199		237
200	typeErrorLabel = new Label(superComposite, SWT.NONE);	238	typeErrorLabel = new Label(superComposite, SWT.NONE);
201	typeErrorLabel.setText(UiPluginResourceBundle.DATA_DLG_ERROR_INDICATOR +	239	typeErrorLabel.setText(UiPluginResourceBundle.DATA_DLG_ERROR_INDICATOR +
202	UiPluginResourceBundle.DATA_COL_DLG_ERROR_TYPE_NOT_VALID);	240	UiPluginResourceBundle.DATA_COL_DLG_ERROR_TYPE_NOT_VALID);
203	gridData = new GridData(GridData.FILL_HORIZONTAL);	241	gridData = new GridData(GridData.FILL_HORIZONTAL);
204	gridData.horizontalSpan = 2;	242	gridData.horizontalSpan = 2;
205	typeErrorLabel.setLayoutData(gridData);	243	typeErrorLabel.setLayoutData(gridData);
206	typeErrorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));	244	typeErrorLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
207	typeErrorLabel.setVisible(false);	245	typeErrorLabel.setVisible(false);
208		246
209	superComposite.pack();	247	superComposite.pack();
210	return superComposite;	248	return superComposite;
211	}	249	}
Lines 236-242 Link Here
236	String _name = nameField.getText();	274	String _name = nameField.getText();
237	if(_name == null \|\| _name.length() == 0)	275	if(_name == null \|\| _name.length() == 0)
238	{	276	{
239	enableButton = false;	277	enableButton = false;
240	nameErrorLabel.setVisible(false);	278	nameErrorLabel.setVisible(false);
241	}	279	}
242	if(_name != null && _name.length() > 0)	280	if(_name != null && _name.length() > 0)
Lines 245-252 Link Here
245	boolean isNameValid = DatapoolUtil.getInstance().isVariableNameValid(_name);	283	boolean isNameValid = DatapoolUtil.getInstance().isVariableNameValid(_name);
246	if(isNameUnique && isNameValid)	284	if(isNameUnique && isNameValid)
247	{	285	{
248	nameField.setForeground(nameFieldForeground);	286	nameField.setForeground(nameFieldForeground);
249	nameErrorLabel.setVisible(false);	287	nameErrorLabel.setVisible(false);
250	}	288	}
251	else	289	else
252	{	290	{
Lines 261-272 Link Here
261	{	299	{
262	nameErrorText += UiPluginResourceBundle.DATA_COL_DLG_ERROR_NAME_NOT_VALID;	300	nameErrorText += UiPluginResourceBundle.DATA_COL_DLG_ERROR_NAME_NOT_VALID;
263	}	301	}
264	nameErrorLabel.setText(nameErrorText);	302	nameErrorLabel.setText(nameErrorText);
265	nameErrorLabel.setVisible(true);	303	nameErrorLabel.setVisible(true);
266	}	304	}
267	}	305	}
268		306
269	getOKButton().setEnabled(enableButton);	307	getOKButton().setEnabled(enableButton);
		308	getDialogArea().pack();
		309	getShell().redraw();
270	return enableButton;	310	return enableButton;
271	}	311	}
272		312
Lines 330-336 Link Here
330	// ISelectionListener	370	// ISelectionListener
331		371
332	/*	372	/*
333	* @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)	373	* @see org.eclipse.swt.events.SelectionListener
		374	* #widgetSelected(org.eclipse.swt.events.SelectionEvent)
334	*/	375	*/
335	public void widgetSelected(SelectionEvent e) {	376	public void widgetSelected(SelectionEvent e) {
336	Combo insertVariableCombo = (Combo)e.widget;	377	Combo insertVariableCombo = (Combo)e.widget;
Lines 382-387 Link Here
382	private String createDefaultName()	423	private String createDefaultName()
383	{	424	{
384	defaultNameCounter++;	425	defaultNameCounter++;
385	return NLS.bind(UiPluginResourceBundle.DATA_VARIABLE_NAME, NumberFormat.getInstance().format(defaultNameCounter));	426	return NLS.bind(UiPluginResourceBundle.DATA_VARIABLE_NAME,
		427	NumberFormat.getInstance().format(defaultNameCounter));
386	}	428	}
		429	public void mouseDoubleClick(MouseEvent e) {
		430
		431	}
		432
		433	public void mouseDown(MouseEvent e) {
		434
		435	}
		436
		437	public void mouseUp(MouseEvent e) {
		438
		439	Button clickButton = (Button)e.getSource();
		440	if(clickButton == null)
		441	{
		442	return;
		443	}
		444	String title = clickButton.getText();
		445	if(title != null)
		446	{
		447	if(title.equals(UiPluginResourceBundle.DatapoolDialog_ENCRYPTED))
		448	{
		449	dealClickCheckBox(clickButton);
		450	}
		451	else if(title.equals(UiPluginResourceBundle.DatapoolDialog_CHANGEKEY))
		452	{
		453	dealClickChangeKey(clickButton);
		454	}
		455	}
		456
		457
		458
		459	}
		460	private void dealClickCheckBox(Button checkBoxButton)
		461	{
		462	//if(key == null \|\| key.equals(""))
		463	//{
		464	// isEncrypted = checkBox.getSelection();
		465	// changeKeyButton.setEnabled(false);
		466	// return ;
		467	//}
		468	checkBox = checkBoxButton;
		469	isEncrypted = checkBox.getSelection();
		470	if(changeKeyButton != null)
		471	{
		472	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		473	changeKeyButton.setEnabled(isChangeKeyButtonEnable());
		474	}
		475	}
		476	public boolean isEncrypted()
		477	{
		478	return isEncrypted;
		479	}
		480	private void dealClickChangeKey(Button changeKeyButton)
		481	{
		482
		483	boolean errorKey = true;
		484	Shell shell = Display.getCurrent().getActiveShell();
		485	DatapoolChangeKeyDialog changeKeyDialog = new DatapoolChangeKeyDialog(shell, datapool, UiPluginResourceBundle.DatapoolDialog_CHANGEKEYDIALOGTITLE);
		486	String key = null;
		487	int retVal = 0;
		488	while(errorKey)
		489	{
		490	if (changeKeyDialog.open() == IDialogConstants.OK_ID) {
		491
		492	key = changeKeyDialog.getOldKey();
493	retVal = changeKeyDialog.isKeyChangeSuccess(datapool);
494	switch(retVal)
495	{
496	case DatapoolConstant.ORIGINT_KEY_ERROR:
497	showErrMes(shell,UiPluginResourceBundle.DatapoolDialog_ORIGINKEYERRORMES);
498	break;
499	case DatapoolConstant.NEW_KEY_NULL:
500	showErrMes(shell,UiPluginResourceBundle.DatapoolDialog_NEWKEYNULLMES);
501	break;
502	case DatapoolConstant.NEW_KEY_NOT_CONFIRM:
503	showErrMes(shell,UiPluginResourceBundle.DatapoolDialog_NEWKEYNOTCONFIRMMES);
504	break;
505	case DatapoolConstant.CHANGE_KEY_SUCCESS:
506	newKey = changeKeyDialog.getNewKey();
507	DatapoolEncryptManager.changeKeyOfEncryptedCell(datapool, key, newKey);
508	key = newKey;
509	try{
510	DatapoolEncryptManager.changeKey(EncryptionManager.EncoderByMd5(key),
511	datapool);
512	}catch(Exception e){
513	}
514	errorKey = false;
515	isKeyChanged = true;
516	break;
517	default://error
518	errorKey = false;
519	isKeyChanged = false;
520	}
521	}
522	else
523	{
524	errorKey = false;
525	isKeyChanged = false;
526	}
527
528	}
529
530	}
531	private void showErrMes(Shell shell,String mes)
532	{
533	MessageDialog.openError(shell,UiPluginResourceBundle.DatapoolDialog_ERRORDIALOGTITLE ,mes);
534	}
535	private boolean isChangeKeyButtonEnable()
536	{
537	boolean retValue = true;
538	if(checkBox != null)
539	{
540	if(!checkBox.getSelection())
541	{
542	retValue = false;
543	}
544
545	}
546
547	return retValue;
548
549	}
550
551	private boolean isVariabelEncrypted(IDatapoolVariable varible)
552	{
553	return (varible instanceof DPLVariable)?((DPLVariable)varible).isEncrypted():false;
554	}
555
556	public String getNewKey() {
557	return newKey;
558	}
559
560
387	}	561	}




/*******************************************************************************
 * Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: DatapoolImportWizard.java,v 1.8 2008/02/28 21:25:21 huangxy Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation

package org.eclipse.hyades.test.ui.internal.wizard;

import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.resources.ResourcesPlugin;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;

import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.models.common.util.DatapoolUtil;
import org.eclipse.hyades.models.common.util.ICommonConstants;
import org.eclipse.hyades.test.core.util.EMFUtil;

import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;
import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
import org.eclipse.hyades.test.ui.internal.util.TestUIUtilities;
import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.actions.WorkspaceModifyOperation;

    					datapool.removeEquivalenceClass(0);
    				}
    				
    				String key = datapoolImportPageTwo.getTextArea().getText();
    				
    				if(datapoolImportPageTwo.isEncrypted()){
    					if(!DatapoolEncryptManager.isKeyCorrect(datapool, key)){
    						datapoolImportPageTwo.setMessage(UiPluginResourceBundle.DatapoolExportWizard_wrongpass,3);
    						datapoolImportPageTwo.getTextArea().setText("");
    						datapoolImportPageTwo.getTextArea().setFocus();
    						throw new Exception("Password is not correct!");
    					}
    				}
    				
    				if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
    				{
    					DatapoolEncryptManager.decryptDatapool(datapool, key);
    				}
    				
    				monitor.worked(1);
    				
    				if(datapool.getVariableCount() == 0){


    				monitor.worked(1);
    				
    				if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
    				{
    					DatapoolEncryptManager.encryptDatapool(datapool, key);
    				}
    				
    				Resource datapoolResource = ((EObject)(datapool)).eResource();
    				
    				EMFUtil.save(datapoolResource);

        };
        
        try {
        	String key = datapoolImportPageTwo.getTextArea().getText();
        	IDatapool datapool = datapoolImportPageTwo.getSelectedDatapool();
			if(datapoolImportPageTwo.isEncrypted()){
				if(!DatapoolEncryptManager.isKeyCorrect(datapool, key)){
					datapoolImportPageTwo.setMessage(UiPluginResourceBundle.DatapoolExportWizard_wrongpass,3);
					datapoolImportPageTwo.getTextArea().setText("");
					datapoolImportPageTwo.getTextArea().setFocus();
					return false;
				}
			}
            getContainer().run(false, false, operation);
        } 
        catch (InvocationTargetException e) {

Lines 38-43 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/ReportExtensionsWizard.java (+1 lines)
38	import org.eclipse.osgi.util.NLS;	38	import org.eclipse.osgi.util.NLS;
39	import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;	39	import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;
40		40
		41
41	/**	42	/**
42	* This wizard is used for the migration from the reportExtensions to the new reportGenerators extension point.	43	* This wizard is used for the migration from the reportExtensions to the new reportGenerators extension point.
43	*	44	*

Lines 14-34 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageTwo.java (-1 / +69 lines)
14	import org.eclipse.core.resources.ResourcesPlugin;	14	import org.eclipse.core.resources.ResourcesPlugin;
15	import org.eclipse.emf.ecore.EObject;	15	import org.eclipse.emf.ecore.EObject;
16	import org.eclipse.hyades.edit.datapool.IDatapool;	16	import org.eclipse.hyades.edit.datapool.IDatapool;
		17	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
17	import org.eclipse.hyades.models.common.util.ICommonConstants;	18	import org.eclipse.hyades.models.common.util.ICommonConstants;
18	import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;	19	import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;
19	import org.eclipse.hyades.test.ui.internal.component.EObjectResourceSelectionViewer;	20	import org.eclipse.hyades.test.ui.internal.component.EObjectResourceSelectionViewer;
20	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;	21	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
21	import org.eclipse.hyades.test.ui.internal.util.TestUIUtilities;	22	import org.eclipse.hyades.test.ui.internal.util.TestUIUtilities;
		23	import org.eclipse.hyades.ui.internal.util.GridDataUtil;
22	import org.eclipse.jface.viewers.IStructuredSelection;	24	import org.eclipse.jface.viewers.IStructuredSelection;
23	import org.eclipse.jface.wizard.WizardPage;	25	import org.eclipse.jface.wizard.WizardPage;
		26	import org.eclipse.osgi.util.NLS;
24	import org.eclipse.swt.SWT;	27	import org.eclipse.swt.SWT;
		28	import org.eclipse.swt.events.ModifyEvent;
		29	import org.eclipse.swt.events.ModifyListener;
25	import org.eclipse.swt.events.SelectionAdapter;	30	import org.eclipse.swt.events.SelectionAdapter;
26	import org.eclipse.swt.events.SelectionEvent;	31	import org.eclipse.swt.events.SelectionEvent;
		32	import org.eclipse.swt.layout.FormAttachment;
		33	import org.eclipse.swt.layout.FormData;
		34	import org.eclipse.swt.layout.FormLayout;
27	import org.eclipse.swt.layout.GridData;	35	import org.eclipse.swt.layout.GridData;
28	import org.eclipse.swt.layout.GridLayout;	36	import org.eclipse.swt.layout.GridLayout;
29	import org.eclipse.swt.widgets.Button;	37	import org.eclipse.swt.widgets.Button;
30	import org.eclipse.swt.widgets.Composite;	38	import org.eclipse.swt.widgets.Composite;
31	import org.eclipse.swt.widgets.Group;	39	import org.eclipse.swt.widgets.Group;
		40	import org.eclipse.swt.widgets.Text;
32		41
33	/**	42	/**
34	* Datapool CSV import page two.	43	* Datapool CSV import page two.
Lines 45-50 Link Here
45	private IStructuredSelection selection = null;	54	private IStructuredSelection selection = null;
46	boolean isPageComplete = false;	55	boolean isPageComplete = false;
47		56
		57	private Group group;
		58	private Text textArea;
		59	private FormData formData;
		60	private boolean isEncrypted = false;
		61
48	public DatapoolImportPageTwo(String name, IStructuredSelection selection){	62	public DatapoolImportPageTwo(String name, IStructuredSelection selection){
49		63
50	super(name);	64	super(name);
Lines 75-81 Link Here
75		89
76	super.setSelection();	90	super.setSelection();
77		91
78	validate();	92	validate();
		93
79	}	94	}
80	};	95	};
81		96
Lines 90-95 Link Here
90	validate();	105	validate();
91	}	106	}
92	});	107	});
		108
		109	group = new Group(pane,SWT.NULL);
		110	group.setText(UiPluginResourceBundle.DatapoolExportWizard_password);
		111	group.setLayoutData(GridDataUtil.createHorizontalFill());
		112	group.setLayout(new FormLayout());
		113	group.setVisible(false);
		114	textArea = new Text(group, SWT.SINGLE \| SWT.FULL_SELECTION \| SWT.BORDER \| SWT.PASSWORD);
		115	formData = new FormData();
		116	formData.left = new FormAttachment(0,5);
		117	formData.top = new FormAttachment(0,5);
		118	formData.bottom = new FormAttachment(80,-5);
		119	formData.width = 200;
		120	textArea.setLayoutData(formData);
		121
		122
		123	textArea.addModifyListener(new ModifyListener(){
		124	public void modifyText(ModifyEvent e){
		125	if(textArea.getText().length()>0){
		126	isPageComplete = true;
		127	getContainer().updateButtons();
		128	}
		129	}
		130	});
93		131
94	TestUIUtilities.setEnabled(exisitingDatapoolGroup, useExistingDatapoolButton.getSelection());	132	TestUIUtilities.setEnabled(exisitingDatapoolGroup, useExistingDatapoolButton.getSelection());
95		133
Lines 148-155 Link Here
148	}	186	}
149	}	187	}
150		188
		189	if(isPageComplete){
		190	IDatapool datapool = getSelectedDatapool();
		191	if(datapool != null)
		192	{
		193	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool)){
		194	isEncrypted = true;
		195	setMessage(NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_encrypted,datapool.getName()),WARNING);
		196	group.setVisible(true);
		197	group.setText(NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_password , datapool.getName()+ ".datapool" ));
		198	textArea.setFocus();
		199	isPageComplete = false;
		200	//getContainer().updateButtons();
		201	}else{
		202	isEncrypted = false;
		203	setMessage(org.eclipse.osgi.util.NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_unencrypted,datapool.getName()));
		204	group.setVisible(false);
		205	textArea.setText("");
		206
		207	getContainer().updateButtons();
		208	}
		209	}
		210	}
151	setErrorMessage(errorMessage);	211	setErrorMessage(errorMessage);
152		212
153	getContainer().updateButtons();	213	getContainer().updateButtons();
154	}	214	}
		215
		216	public Text getTextArea(){
		217	return textArea;
		218	}
		219
		220	public boolean isEncrypted(){
		221	return isEncrypted;
		222	}
155	}	223	}

Lines 1-10 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportSelectionPage.java (-4 / +60 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: DatapoolExportSelectionPage.java,v 1.5 2007/03/22 14:42:03 paules Exp $	7	* $Id: DatapoolExportSelectionPage.java,v 1.5 2008/02/28 14:42:03 huangxy Exp $
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
Lines 14-19 Link Here
14	import org.eclipse.core.resources.IResource;	14	import org.eclipse.core.resources.IResource;
15	import org.eclipse.core.resources.ResourcesPlugin;	15	import org.eclipse.core.resources.ResourcesPlugin;
16	import org.eclipse.hyades.edit.datapool.IDatapool;	16	import org.eclipse.hyades.edit.datapool.IDatapool;
		17	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
17	import org.eclipse.hyades.models.common.util.ICommonConstants;	18	import org.eclipse.hyades.models.common.util.ICommonConstants;
18	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;	19	import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
19	import org.eclipse.hyades.test.ui.dialog.EObjectResourceContentProvider;	20	import org.eclipse.hyades.test.ui.dialog.EObjectResourceContentProvider;
Lines 26-39 Link Here
26	import org.eclipse.jface.viewers.Viewer;	27	import org.eclipse.jface.viewers.Viewer;
27	import org.eclipse.jface.viewers.ViewerSorter;	28	import org.eclipse.jface.viewers.ViewerSorter;
28	import org.eclipse.jface.wizard.WizardPage;	29	import org.eclipse.jface.wizard.WizardPage;
		30	import org.eclipse.osgi.util.NLS;
29	import org.eclipse.swt.SWT;	31	import org.eclipse.swt.SWT;
		32	import org.eclipse.swt.events.ModifyEvent;
		33	import org.eclipse.swt.events.ModifyListener;
30	import org.eclipse.swt.events.SelectionEvent;	34	import org.eclipse.swt.events.SelectionEvent;
31	import org.eclipse.swt.events.SelectionListener;	35	import org.eclipse.swt.events.SelectionListener;
32	import org.eclipse.swt.graphics.Image;	36	import org.eclipse.swt.graphics.Image;
		37	import org.eclipse.swt.layout.FormAttachment;
		38	import org.eclipse.swt.layout.FormData;
		39	import org.eclipse.swt.layout.FormLayout;
33	import org.eclipse.swt.layout.GridData;	40	import org.eclipse.swt.layout.GridData;
34	import org.eclipse.swt.layout.GridLayout;	41	import org.eclipse.swt.layout.GridLayout;
35	import org.eclipse.swt.widgets.Button;	42	import org.eclipse.swt.widgets.Button;
36	import org.eclipse.swt.widgets.Composite;	43	import org.eclipse.swt.widgets.Composite;
		44	import org.eclipse.swt.widgets.Group;
		45	import org.eclipse.swt.widgets.Text;
37	import org.eclipse.swt.widgets.Tree;	46	import org.eclipse.swt.widgets.Tree;
38		47
39	/**	48	/**
Lines 50-55 Link Here
50	private EObjectResourceContentProvider contentProvider;	59	private EObjectResourceContentProvider contentProvider;
51	private String[] fileExtensions;	60	private String[] fileExtensions;
52	private Image fileImage;	61	private Image fileImage;
		62	private Group group;
		63	private Text textArea;
		64	private FormData formData;
		65	private boolean isEncrypted = false;
53		66
54	/**	67	/**
55	* @param pageName	68	* @param pageName
Lines 148-155 Link Here
148	};	161	};
149	assetViewer.setSorter(sorter);	162	assetViewer.setSorter(sorter);
150		163
		164	group = new Group(parent,SWT.NULL);
		165	group.setText(UiPluginResourceBundle.DatapoolExportWizard_password);
		166	group.setLayoutData(GridDataUtil.createHorizontalFill());
		167	group.setLayout(new FormLayout());
		168	group.setVisible(false);
		169	textArea = new Text(group, SWT.SINGLE \| SWT.FULL_SELECTION \| SWT.BORDER \| SWT.PASSWORD);
		170	formData = new FormData();
		171	formData.left = new FormAttachment(0,5);
		172	formData.top = new FormAttachment(0,5);
		173	formData.bottom = new FormAttachment(80,-5);
		174	formData.width = 200;
		175	textArea.setLayoutData(formData);
		176	textArea.addModifyListener(new ModifyListener(){
		177	public void modifyText(ModifyEvent e){
		178	if(textArea.getText().length()>0){
		179	setPageComplete(true);
		180	}
		181	}
		182	});
151	return assetViewer;	183	return assetViewer;
152	}	184	}
		185
		186	public Text getTextArea(){
		187	return textArea;
		188	}
		189
		190	public boolean isEncrypted(){
		191	return isEncrypted;
		192	}
153		193
154	private void setSelection()	194	private void setSelection()
155	{	195	{
Lines 162-169 Link Here
162	datapool = (IDatapool)selectedObject;	202	datapool = (IDatapool)selectedObject;
163	if(datapool != null)	203	if(datapool != null)
164	{	204	{
165	setPageComplete(true);	205	if(DatapoolEncryptManager.isDatapoolEncrypted(datapool)){
166	getContainer().updateButtons();	206	isEncrypted = true;
		207	setMessage(NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_encrypted,datapool.getName()),WARNING);
		208	group.setVisible(true);
		209	group.setText(NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_password , datapool.getName()+ ".datapool"));
		210	textArea.setFocus();
		211
		212	setPageComplete(false);
		213	//getContainer().updateButtons();
		214	}else{
		215	isEncrypted = false;
		216	setMessage(org.eclipse.osgi.util.NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_unencrypted,datapool.getName()));
		217	group.setVisible(false);
		218	textArea.setText("");
		219
		220	setPageComplete(true);
		221	getContainer().updateButtons();
		222	}
167	}	223	}
168	}	224	}
169	}	225	}




 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: DatapoolExportWizard.java,v 1.12 2008/02/28 19:09:14 huangxy Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;

	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
	 */	
	public boolean performFinish() 
	{
		IDatapool datapool = datapoolSelectionPage.getDatapool();
		String key = datapoolSelectionPage.getTextArea().getText();
		
		if(datapoolSelectionPage.isEncrypted()){
			if(!DatapoolEncryptManager.isKeyCorrect(datapool, key)){
				datapoolSelectionPage.setMessage(UiPluginResourceBundle.DatapoolExportWizard_wrongpass,3);
				datapoolSelectionPage.getTextArea().setText("");
				datapoolSelectionPage.getTextArea().setFocus();
				return false;
			}
		}
		
		//decrypt datapool before export it into csv file 
		if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		{
			DatapoolEncryptManager.decryptDatapool(datapool, key);
		}
		String csvFileName = csvFileLocationPage.getCSVFileName();
		if(!csvFileName.endsWith(".csv") && !csvFileName.endsWith(".CSV"))
			csvFileName = csvFileName + ".csv";

                UiPlugin.logError(e);
            }
        }
        
        //encrypted datapool again after finish export it  
        if( DatapoolEncryptManager.isDatapoolEncrypted(datapool))
		{
			DatapoolEncryptManager.encryptDatapool(datapool, key);
		}
        return close;
	}
}




 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: DatapoolTable.java,v 1.45 2008/02/27 19:09:13 huangxy Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation

import org.eclipse.hyades.edit.datapool.IDatapoolRecord;
import org.eclipse.hyades.edit.datapool.IDatapoolSuggestedType;
import org.eclipse.hyades.edit.datapool.IDatapoolVariable;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.datapool.DPLVariable;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.models.common.util.EncryptionManager;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolChangeKeyDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolColumnDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolConstant;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolDeleteColumnDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolInputKeyDialog;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolRowDialog;
import org.eclipse.hyades.test.ui.datapool.internal.interfaces.IDatapoolPart;
import org.eclipse.hyades.test.ui.datapool.internal.interfaces.IValidateValueClass;
import org.eclipse.hyades.test.ui.datapool.internal.interfaces.IValueClassFactory;
import org.eclipse.hyades.test.ui.datapool.internal.util.DatapoolUtil;
import org.eclipse.hyades.test.ui.datapool.internal.util.EncryptedValueObject;
import org.eclipse.hyades.test.ui.datapool.internal.util.TypeChecker;
import org.eclipse.hyades.test.ui.datapool.internal.util.ValueClassMap;
import org.eclipse.hyades.test.ui.datapool.internal.util.ValueObject;

	private boolean showRecords = true;
	private boolean isF2Mode = false;
	private int previousMultiRowSelectionIndex = -1;  // only used for deselecting when multi-selection in place.
	private String cellkey;
	private boolean passwordExist = false;
	private String password = null;
	
	private String vendorID = null;
	

			if(rawValue == null)
			{	
				String typeName = suggestedType.getSuggestedClassName();					
				if (typeName == null || typeName.length() == 0) {
				{
					rawValue = new String();
				} else {
				else
				{
					rawValue = createEmptyCellObject(typeName);
				}
			}
			if(DatapoolEncryptManager.isVariabelEncrypted(variable))
			{
				boolean errorKey = true;
				boolean isCancelChange = false;
				String key = null;
				if(passwordExist){
					key = password;
					cellkey = key;
				}else{
					DatapoolInputKeyDialog logOnDialog = new DatapoolInputKeyDialog(
							Display.getCurrent().getActiveShell(),
							UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE,
							datapool);
	
					
					while (errorKey) {
						int openValue = logOnDialog.open();
						if (openValue == IDialogConstants.OK_ID) {
							key = logOnDialog.getKey();
							cellkey = key;
							if (DatapoolEncryptManager.isKeyCorrect(datapool, key)) {
								errorKey = false;
								password = key;
								passwordExist = true;
							} else {//the input key is incorrect
								showErrMes(Display.getCurrent()
										.getActiveShell(),
										UiPluginResourceBundle.DatapoolDialog_WRONGLOGONKEYMES);
							}
						} else if (openValue == IDialogConstants.CANCEL_ID) {// click cancel button
							isCancelChange = true;
							errorKey = false;
	
						}
					}
					
					if(isCancelChange)
					{
						return;
					}
				}
				rawValue = EncryptionManager.decrypt(rawValue.toString(), key);
				theValueObject = new EncryptedValueObject(rawValue);
				cellEditor = (CellEditor) theValueObject
				.getEncryptedDisplay(tableCursor);
			}else{
				theValueObject = new ValueObject(rawValue);
				cellEditor = (CellEditor) theValueObject.getPropertyDisplay(tableCursor);
			}
//			cellEditor = new TextCellEditor(tableCursor,SWT.PASSWORD);
//			cellEditor.setValue(rawValue.toString());
//			int oldStyle = cellEditor.getStyle();
//			cellEditor.setStyle(SWT.PASSWORD|oldStyle);
//			oldStyle = cellEditor.getStyle();
		}
		
		if(cellEditor != null && cellEditor.getControl() != null)
		{

					}
				}
				
				if (update) {
					if(DatapoolEncryptManager.isVariabelEncrypted(cell.getCellVariable()))
					{
						String value = String.valueOf(updatedValue);
						String encryptValue = DatapoolEncryptManager.encrypt(value, cellkey);
						updatedValue = (Object)encryptValue;
						
					}
					cell.setCellValue(updatedValue);
					selectedTableItem.setText(selectedColumnIndex, newDescription);
					tableCursor.setSelection(table.getSelectionIndex(), selectedColumnIndex);

			}
			
			if(dispose)
				refreshRows();
				clearCellEditor();
		}						
	}


		IDatapool datapool = getDatapool();
		DatapoolColumnDialog dialog = new DatapoolColumnDialog(Display.getCurrent().getActiveShell(), datapool, null, previousVariable, UiPluginResourceBundle.DATA_COL_DLG_TITLE_INS);  
		if (dialog.open() == IDialogConstants.OK_ID) {
			if(dialog.isEncrypted()){
			String key = null;			
			if(isKeyExist())
			{
				boolean errorKey = true;
				if(passwordExist && !dialog.isKeyChanged()){
					key = password;
				}else{
					DatapoolInputKeyDialog logOnDialog = new DatapoolInputKeyDialog(
							Display.getCurrent().getActiveShell(),
							UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE,
							datapool);
					while (errorKey) {
						int openValue = logOnDialog.open();
						if (openValue == IDialogConstants.OK_ID) {
							key = logOnDialog.getKey();
							if (DatapoolEncryptManager.isKeyCorrect(datapool,key)) {
								errorKey = false;
								password = key;
								passwordExist = true;
							} else {
								showErrMes(Display.getCurrent()
										.getActiveShell(),
										UiPluginResourceBundle.DatapoolDialog_WRONGLOGONKEYMES);
							}
						} else if (openValue == IDialogConstants.CANCEL_ID) {
							errorKey = false;
						}
					}
				}
			}
			else
			{
				Shell shell = Display.getCurrent().getActiveShell();
				DatapoolChangeKeyDialog assignKeyDialog = new DatapoolChangeKeyDialog(
						shell, datapool,
						UiPluginResourceBundle.DatapoolDialog_ASSIGNKEYDIALOGTITLE);
				boolean errorKey = true;				
				while (errorKey) {
					if (assignKeyDialog.open() == IDialogConstants.OK_ID) {
						key = assignKeyDialog.getNewKey();
						int ret = assignKeyDialog.isKeyAssignSuccess();
						switch (ret) {
						case DatapoolConstant.NEW_KEY_NULL:
							showErrMes(shell,
									UiPluginResourceBundle.DatapoolDialog_NEWKEYNULLMES);
							break;
						case DatapoolConstant.NEW_KEY_NOT_CONFIRM:
							showErrMes(
									shell,
									UiPluginResourceBundle.DatapoolDialog_NEWKEYNOTCONFIRMMES);
							break;
						case DatapoolConstant.CHANGE_KEY_SUCCESS:									
							try{
							DatapoolEncryptManager.changeKey(EncryptionManager.EncoderByMd5(key),
									datapool);
//							
							errorKey = false;
							password = key;
							passwordExist = true;
							}catch(Exception e){}
							break;
						default:// error
						}
					} else {						
						errorKey = false;
					}
				}
			}
			}
			
			setWaitCursor();
			IDatapoolVariable variable = datapool.constructVariable();
			variable.setName(dialog.getName());
			IDatapoolSuggestedType suggestedType = (IDatapoolSuggestedType)variable.getSuggestedType();
			setVariableType(suggestedType, dialog.getType());
			variable.setSuggestedType(suggestedType);
			
			((DPLVariable)variable).setEncrypted(dialog.isEncrypted());
			
			int insertionIndex = findColumnIndex(dialog
					.getInsertionVariableName());
			if(insertionIndex == -1)
				insertionIndex = 0;


			if (tableCursor != null && !tableCursor.isDisposed() && !(row < 0 || row >= table.getItemCount() || insertionIndex < 0 || insertionIndex > maxColumnIndex)) {
                tableCursor.setSelection(row, insertionIndex + 1);			
            }
			refreshRows();
		}
	}


	 * Function that actually does the editing of the variable/column.
	 */	
	private void editColumnAux(TableColumn tableColumn) {
		boolean isVariableEncrypted = false;
        try {
            if (showVariables == false) return;


            IDatapoolVariable previousVariable = null;
            if (previousTableColumn != null) previousVariable = (IDatapoolVariable) previousTableColumn.getData(TAG_VARIABLE);
            IDatapoolVariable variable = (IDatapoolVariable) tableColumn.getData(TAG_VARIABLE);
            DatapoolColumnDialog dialog = new DatapoolColumnDialog(Display
					.getCurrent().getActiveShell(), datapool, variable,
					previousVariable,
					UiPluginResourceBundle.DATA_COL_DLG_TITLE_EDIT); //$NON-NLS-1$
			isVariableEncrypted = DatapoolEncryptManager.isVariabelEncrypted(variable);
			String key = null;
			if (dialog.open() == IDialogConstants.OK_ID) {
				if (isNeedKeyVerify(dialog,isVariableEncrypted)) {//need to confrim key or assign a new key
					boolean isCancelChange = false;
					if(isKeyExist())//key exists means it needs to confirm key
					{
						//if(dialog.isKeyChanged())
						//{
							//key = dialog.getKey();							
						//}
						boolean errorKey = true;
						
						if(passwordExist && !dialog.isKeyChanged()){
							key = password;
						}else {
							if(dialog.isKeyChanged()){
								key = dialog.getNewKey();
								password = dialog.getNewKey();
								passwordExist = true;
							}else{						
								DatapoolInputKeyDialog logOnDialog = new DatapoolInputKeyDialog(
										Display.getCurrent().getActiveShell(),
										UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE,
										datapool);
								while (errorKey) {
									int openValue = logOnDialog.open();
									if (openValue == IDialogConstants.OK_ID) {
										key = logOnDialog.getKey();									
										if (DatapoolEncryptManager.isKeyCorrect(datapool,key)) {
											errorKey = false;
											password = key;
											passwordExist = true;
										} else {//the input key is incorrect
											showErrMes(Display.getCurrent()
													.getActiveShell(),
													UiPluginResourceBundle.DatapoolDialog_WRONGLOGONKEYMES);
										}
									} else if (openValue == IDialogConstants.CANCEL_ID) {// click cancel button
										isCancelChange = true;
										errorKey = false;
									}
								}
							}
							
						}
					}
					else//it should assing a new key
					{
						Shell shell = Display.getCurrent().getActiveShell();
						DatapoolChangeKeyDialog assignKeyDialog = new DatapoolChangeKeyDialog(
								shell, datapool,
								UiPluginResourceBundle.DatapoolDialog_ASSIGNKEYDIALOGTITLE);
						boolean errorKey = true;
						
						while (errorKey) {

							if (assignKeyDialog.open() == IDialogConstants.OK_ID) {
								key = assignKeyDialog.getNewKey();
								int ret = assignKeyDialog.isKeyAssignSuccess();
								switch (ret) {
								case DatapoolConstant.NEW_KEY_NULL:
									showErrMes(shell,
											UiPluginResourceBundle.DatapoolDialog_NEWKEYNULLMES);
									break;
								case DatapoolConstant.NEW_KEY_NOT_CONFIRM:
									showErrMes(
											shell,
											UiPluginResourceBundle.DatapoolDialog_NEWKEYNOTCONFIRMMES);
									break;
								case DatapoolConstant.CHANGE_KEY_SUCCESS:									
									try{
									DatapoolEncryptManager.changeKey(EncryptionManager.EncoderByMd5(key),
											datapool);
//									encryptedCellInVarible(variable,newKey);
									errorKey = false;									
									
									password = key;
									passwordExist = true;
									}catch(Exception e){}
									break;
								default:// error
								}

							} else {
								isCancelChange = true;
								errorKey = false;
							}
						}
					}
					if(!isCancelChange)//input the correct key
					{					
						if (dialog.isEncrypted()) {
							if (!isVariableEncrypted) {//encrypted a varible which didn't encrypted
								DatapoolEncryptManager.encryptedCellInVarible(variable,key,datapool);
								if(variable instanceof DPLVariable)
									((DPLVariable)variable).setEncrypted(true);
							}

						} else {
							if (isVariableEncrypted) {//deencrypted a encrypted variable
								DatapoolEncryptManager.decryptedCellInVarible(variable,key,datapool);
								if(variable instanceof DPLVariable)
									((DPLVariable)variable).setEncrypted(false);
							}
						}
                setWaitCursor();
                String name = dialog.getName();
                String insertionVariableID = dialog.getInsertionVariableID();

                variable.setName(dialog.getName());
                setVariableType(suggestedType, dialog.getType());
                variable.setSuggestedType(suggestedType);
						int insertionIndex = findColumnIndex(dialog
								.getInsertionVariableName());
						if (insertionIndex == columnIndex - 1) {
							refresh();
							return;
						}
						if (insertionIndex == -1)
							datapool.moveVariable(columnIndex - 1, 0);
						else if (insertionIndex > columnIndex)
							datapool.moveVariable(columnIndex - 1,
									insertionIndex - 1);
						else
							datapool.moveVariable(columnIndex - 1, insertionIndex);

						refreshRows();//needs to refresh row
						tableCursor.setSelection(0, 0);
					}
				
				} else {
					setWaitCursor();

					String name = dialog.getName();
					String insertionVariableID = dialog
							.getInsertionVariableID();

					IDatapoolSuggestedType suggestedType = (IDatapoolSuggestedType) variable
							.getSuggestedType();
					if (name.equals(variable.getName())
							&& insertionVariableID.equals(variable.getId())) {
						return;
					}
					variable.setName(dialog.getName());
					setVariableType(suggestedType, dialog.getType());
					variable.setSuggestedType(suggestedType);
					
					int insertionIndex = findColumnIndex(dialog
							.getInsertionVariableName());
                if (insertionIndex == columnIndex - 1) {
                    return;
                }

                    datapool.moveVariable(columnIndex - 1, insertionIndex - 1);
                else
                    datapool.moveVariable(columnIndex - 1, insertionIndex);
					tableCursor.setSelection(0, 0);
            }
        }} finally {
            unsetWaitCursor();
        }
    }

				IDatapoolVariable cellVariable = (IDatapoolVariable)cell.getCellVariable();
				int index = findColumnIndex(cellVariable.getName());
				String cellValue = cell.getStringValue();
				if(DatapoolEncryptManager.isVariabelEncrypted(cell.getCellVariable()))
				{
					cellValue = DatapoolConstant.DatapoolDialog_ENCRYPTEDDISPLAYVALUE;
				}
//				ValueObject valueObject = new ValueObject(cell.getCellValue());
				ValueObject valueObject = new ValueObject(cellValue);
				if(valueObject != null)
					cellValue = valueObject.getDescription();
				rowContents[index] = cellValue;

		setMenuMode(datapoolMenuManager);
	}
	
	public void setPassword(String password){
		this.password = password;
	}
	private void showErrMes(Shell shell, String mes) {
		MessageDialog.openError(shell, UiPluginResourceBundle.DatapoolDialog_ERRORDIALOGTITLE, mes);
	}
	
		private boolean isNeedKeyVerify(DatapoolColumnDialog dialog,boolean isVariableEncrypted)
		{
			return dialog.isEncrypted() || isVariableEncrypted;
		}
		private boolean isKeyExist()
		{
			return (datapool instanceof DPLDatapool)?(((DPLDatapool)datapool).getChallenge()!=null):false;	
		}	
}

Lines 924-929 Link Here

(-)plugin.xml (+8 lines)
924	testType="org.eclipse.hyades.test.http.junit.testSuite">	924	testType="org.eclipse.hyades.test.http.junit.testSuite">
925	</verdictProvider>	925	</verdictProvider>
926	</extension>	926	</extension>
		927	<extension
		928	point="org.eclipse.hyades.test.core.launchDatapoolCheckPass">
		929	<launchDatapoolCheckPass
		930	uiClass="org.eclipse.hyades.test.ui.dialog.DatapoolCheck">
		931	<supportedTestType>
		932	</supportedTestType>
		933	</launchDatapoolCheckPass>
		934	</extension>
927		935
928		936
929	</plugin>	937	</plugin>




DatapoolImportWizard_PageTwo_datapoolsGroup=Datapools
DatapoolImportWizard_LocationPage_description=Import data from a CSV file to a new datapool.
DatapoolImportWizard_diffVariableInfoWarning=The variable (column) name or type information in the datapool are different than the CSV file.
DatapoolExportWizard_encrypted= {0} is encrypted. Please enter the password.
DatapoolExportWizard_unencrypted= {0} is not encrypted. Press Finish to complete.
DatapoolImportWizard_progressMonitor=Importing the CSV file
DatapoolExportWizard_wrongpass=Incorrect password. Please enter the correct password.
DatapoolExportWizard_rightpass=You passed. Check Finish to complete.
DatapoolExportWizard_password= Password for {0}:

DatapoolDialog_CHANGEKEY= &Modify Password
DatapoolDialog_ENCRYPTED= &Encrypt
DatapoolDialog_ASSIGNKEYDIALOGTITLE= Set Password
DatapoolDialog_CHANGEKEYDIALOGTITLE= Change Password
DatapoolDialog_OLDKEY= &Old Password:
DatapoolDialog_NEWKEY= &New Password:
DatapoolDialog_CONFIRMNEWKEY= &Confirm New Password:
DatapoolDialog_ORIGINKEYERRORMES= The old password is incorrect.
DatapoolDialog_NEWKEYNULLMES= The new password should not be null
DatapoolDialog_NEWKEYNOTCONFIRMMES= The passwords you typed do not match.
DatapoolDialog_WRONGLOGONKEYMES= The password you typed is incorrect.
DatapoolDialog_ERRORDIALOGTITLE=Error
DatapoolDialog_INPUTKEYDIALGOTITLE= Enter Password
DatapoolDialog_OK=OK
DatapoolDialog_PASSWORDSHINT= The password is not correct for each of the following encrypted datapools:\n\n
DatapoolDialog_TRYAGAIN=\n\nPlease try again or Cancel
DatapoolDialog_NOTALLMATCH=Passwords not all matched!
DatapoolDialog_INPUTPASSHINT= Please enter the password for each of the following encrypted datapools:
ToggleViewAction_resource_label=Resource test navigator
ToggleViewAction_resource_description=Show the resource test navigator
ToggleViewAction_resource_tooltip=Show the resource test navigator




	public static String DatapoolImportWizard_PageTwo_useExistingButton;
	public static String DatapoolImportWizard_PageTwo_datapoolsGroup;
	public static String DatapoolImportWizard_diffVariableInfoWarning;
	public static String DatapoolImportWizard_editOrSelectDatapool;
	public static String DatapoolImportWizard_selectCSV;
	public static String DatapoolImportWizard_selectDatapool;
	public static String DatapoolExportWizard_encrypted;
	public static String DatapoolExportWizard_unencrypted;
	public static String DatapoolImportWizard_progressMonitor;
	public static String DatapoolExportWizard_wrongpass;
	public static String DatapoolExportWizard_password;
	public static String DatapoolDialog_CHANGEKEY;
    public static String DatapoolDialog_ENCRYPTED;
	public static String DatapoolDialog_ASSIGNKEYDIALOGTITLE;
	public static String DatapoolDialog_CHANGEKEYDIALOGTITLE;
	public static String DatapoolDialog_OLDKEY;
	public static String DatapoolDialog_NEWKEY;
	public static String DatapoolDialog_CONFIRMNEWKEY;
	public static String DatapoolDialog_ORIGINKEYERRORMES;
	public static String DatapoolDialog_NEWKEYNULLMES;
	public static String DatapoolDialog_NEWKEYNOTCONFIRMMES;
	public static String DatapoolDialog_WRONGLOGONKEYMES;
	public static String DatapoolDialog_ERRORDIALOGTITLE;
	public static String DatapoolDialog_INPUTKEYDIALGOTITLE;
	public static String DatapoolDialog_OK;
	public static String DatapoolDialog_PASSWORDSHINT;	
	public static String DatapoolDialog_TRYAGAIN;
	public static String DatapoolDialog_NOTALLMATCH;
	public static String DatapoolDialog_INPUTPASSHINT;
	public static String ToggleViewAction_resource_label;
	public static String ToggleViewAction_resource_description;
	public static String ToggleViewAction_resource_tooltip;




/*******************************************************************************
 * Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: DatapoolEditorExtension.java,v 1.17 2008/02/28 12:06:54 huangxy Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation


    /* (non-Javadoc)
     * @see org.eclipse.hyades.ui.editor.IEditorExtension#createPages()
     */    
    public void createPages() {
    	IHyadesEditorPart hyadesEditorPart = getHyadesEditorPart();
        WidgetFactory widgetFactory = new WidgetFactory();

        datapoolForm = new DatapoolForm(this, widgetFactory);

        hyadesEditorPart.setPageText(PAGE_OVERVIEW, UiPluginResourceBundle.W_OVERVIEW); 
        datapoolForm.updateTitle();

        IDatapool dp = getDatapool(); 
        for (int i = 0; i < dp.getEquivalenceClassCount(); i++) {
            addEquivalenceClassPage(i);
        }

    public void connectPart(IWorkbenchPart part) {
        DatapoolActionHandlerListener.INSTANCE.connectPart(part);
    }
    /**
     * used for DatapoolEditorPart to save
     * deal with the encrypted datapool
     * */
    public void save(){
    	if(super.getProgressMonitor() != null){
    		try{
    			super.save(super.getProgressMonitor());
    		}catch(Exception e){
    			e.printStackTrace();
    		}
		}
    }
}




/*******************************************************************************
 * Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: ValueObject.java,v 1.4 2008/02/28 18:21:30 huangxy Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation

public class ValueObject {

	private Object theObject;
	protected IDisplayValueClass valueClass;
	private String description;
	private Object display;
	

		return null;
	}
	
	/**
	 *@param parent
	 *@return Object
	 */
	public Object getEncryptedDisplay(Composite parent)
	{
		if ( display != null && display instanceof CellEditor )
		{
			Control control = ((CellEditor)display).getControl();
			if ( control != null && !control.isDisposed() )
				return display;
		}
		if ( valueClass != null )
		{
			display = ((EncryptedStringValueClass)valueClass).getPropertyDisplay(theObject, parent, true);
			return display;
		}
		return null;
	}
	public Object getDialogDisplay(Composite parent, boolean isEditable)
	{
		return null;

Lines 12-18 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/editor/DatapoolEditorPart.java (-1 / +22 lines)
12	package org.eclipse.hyades.test.ui.internal.editor;	12	package org.eclipse.hyades.test.ui.internal.editor;
13		13
14	import org.eclipse.emf.ecore.EObject;	14	import org.eclipse.emf.ecore.EObject;
		15	import org.eclipse.hyades.edit.datapool.IDatapool;
15	import org.eclipse.hyades.models.common.datapool.DPLDatapool;	16	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
		17	import org.eclipse.hyades.models.common.datapool.impl.DPLVariableImpl;
		18	import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
16	import org.eclipse.hyades.models.common.util.ICommonConstants;	19	import org.eclipse.hyades.models.common.util.ICommonConstants;
17	import org.eclipse.hyades.test.ui.TestUIExtension;	20	import org.eclipse.hyades.test.ui.TestUIExtension;
18	import org.eclipse.hyades.test.ui.internal.editor.extension.DatapoolEditorExtension;	21	import org.eclipse.hyades.test.ui.internal.editor.extension.DatapoolEditorExtension;
Lines 86-90 Link Here
86	return true;	89	return true;
87	}	90	}
88		91
89		92	public void dispose(){
		93	if(this.getEditorExtension() instanceof DatapoolEditorExtension){
		94	IDatapool dp = ((DatapoolEditorExtension)this.getEditorExtension()).getDatapool();
		95	boolean isAnyColumnEncrypted = false;
		96	int variableCount = dp.getVariableCount();
		97	for(int i=0;i<variableCount;i++){
		98	if(DatapoolEncryptManager.isVariabelEncrypted(((DPLVariableImpl)dp.getVariable(i)))){
		99	isAnyColumnEncrypted = true;
		100	break;
		101	}
		102	}
		103	if(!isAnyColumnEncrypted && (dp instanceof DPLDatapool)){
		104	((DPLDatapool)dp).setChallenge(null);
		105	((DatapoolEditorExtension)this.getEditorExtension()).save();
		106	}
		107	}
		108	super.dispose();
		109
		110	}
90	}	111	}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolConstant.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.datapool.internal.dialog;

/**
* It's used to provide constant message for datapool related dialog .
* 
* @author Huang Xin Ying 
*/
public class DatapoolConstant {
	public static final int CHANGE_KEY_SUCCESS = 0; 
	public static final int ORIGINT_KEY_ERROR = 1;  
	public static final int NEW_KEY_NULL = 2;      
	public static final int NEW_KEY_NOT_CONFIRM = 3;  
	
	public static final String DatapoolDialog_SPLITMARK = "::";  
	public static final String DatapoolDialog_ENCRYPTEDDISPLAYVALUE = "******";
	public static final String DatapoolDialog_TRUE = "true" ;
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: EncryptedStringValueClass.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.datapool.internal.util;

import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;

/**
 * @author Huang Xin Ying 
 * @version February ,27
 */
public class EncryptedStringValueClass extends StringValueClass{
	/**
	 * Return the cell editor or label for encrypted cell object .
	 * @param theObject
	 * @param parent
	 * @param editable
	 * @return Object
	 */
	public Object getPropertyDisplay(Object theObject, Composite parent, boolean editable)
	{
		if(editable && theObject != null)
		{
			TextCellEditor cellEditor = new TextCellEditor(parent,SWT.PASSWORD);

			cellEditor.setValue(theObject.toString());
			return cellEditor;
		}
		else
		{
			Label label = new Label(parent, SWT.NONE);
			label.setText(getPropertyDescription(theObject));
			return label;
		}
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: EncryptedValueObject.java,v 1.0 2008/02/28 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.ui.datapool.internal.util;

/**
* @author Huang Xin Ying 
*/
public class EncryptedValueObject extends ValueObject{

	public EncryptedValueObject(Object theObject) {
		super(theObject);
		valueClass = new EncryptedStringValueClass();
		
		
	}
	

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolCheck.java,v 1.0 2008/02/18 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.ui.dialog;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.util.EncryptionManager;
import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolConstant;
import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
 * 
 * It's the implementation of launchDatapoolCheckPass extension point , provide
 * dialog to prompt user input password for encrypted datapool during launching a test 
 * on workbench side .
 * 
 * @author Huang Xin Ying 
 * @version February 28, 2008
 */
public class DatapoolCheck implements IPassInfoCollector {

	public DatapoolCheck() {
	}
    
	/**
	 * Create a dialog to prompt user input the passwords for encrypted datapools
	 *  while running a test suite .
	 * @param dp
	 * @param pass
	 * @pass isContinue
	 */
	public void execute(DPLDatapool[] dp, Map pass, List isContinue) {
		DialogRun dr = new DialogRun();
		dr.setDp(dp);
		dr.setContinue(isContinue);
		dr.setPass(pass);
		Display.getDefault().syncExec(dr);
	}

	private class DialogRun implements Runnable {
		private DPLDatapool[] dp;
		private Map pass;
		private List isContinue;

		public void setDp(DPLDatapool[] dp) {
			this.dp = dp;
		}

		public void setPass(Map pass) {
			this.pass = pass;
		}

		public void setContinue(List isContinue) {
			this.isContinue = isContinue;
		}

		public void run() {
			String testId = null;
			if(isContinue != null && isContinue.size() == 1){
				testId = (String)isContinue.get(0);
				isContinue.clear();
			}
			DatapoolCheckDialog db = new DatapoolCheckDialog(null, 
					dp, 
					UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE,
					pass,
					testId);
			db.setBlockOnOpen(true);
			if (db.open() == IDialogConstants.OK_ID) {
				isContinue.add(DatapoolConstant.DatapoolDialog_TRUE);
			}
		}
	}
    
	
	private class DatapoolCheckDialog extends Dialog implements KeyListener {
		private Button okButton;

		private Button checkButton;

		private DPLDatapool[] dp;
		private String title;
		private int dpNameLength = 0;
		private int oriHeight = 0;
		private Label[] name;
		private Text[] pass;
		private Button[] status;
		private List unCorrectList = new ArrayList();
		private Map passed;
		private String testId;

		/**
		 * @param parentShell
		 */
		public DatapoolCheckDialog(Shell parentShell) {
			super(parentShell);
		}

		public DatapoolCheckDialog(Shell parentShell, DPLDatapool[] dp,
				String title, Map passed,String testId) {
			super(parentShell);
			this.dp = dp;
			this.title = title;
			this.passed = passed;
			this.testId = testId;
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
		 */
		protected void createButtonsForButtonBar(Composite parent) {
			// create OK and Cancel buttons by default
			okButton = createButton(parent, IDialogConstants.OK_ID,
					IDialogConstants.OK_LABEL, true);
			checkButton = createButton(parent, IDialogConstants.YES_ID,
					IDialogConstants.YES_LABEL, false);
			checkButton.setText(UiPluginResourceBundle.DatapoolDialog_OK);
			checkButton.addMouseListener(new MouseAdapter() {
				public void mouseDown(MouseEvent e) {
					enableOK();
				}
			});

			createButton(parent, IDialogConstants.CANCEL_ID,
					IDialogConstants.CANCEL_LABEL, false);
			okButton.setVisible(false);
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.dialogs.Dialog#getButton(int)
		 */
		protected Button getButton(int id) {
			if (id == IDialogConstants.OK_ID)
				return okButton;
			return super.getButton(id);
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see org.eclipse.jface.dialogs.Dialog#getOKButton()
		 */
		protected Button getOKButton() {
			return okButton;
		}

		/* modified the content */
		protected Control createDialogArea(Composite parent) {
			getShell().setText(title);
			Composite superComposite = (Composite) super
					.createDialogArea(parent);

			superComposite.setLayout(new FormLayout());

			FormData formData;

			Label hint = new Label(superComposite, SWT.NULL);
			hint.setText(UiPluginResourceBundle.DatapoolDialog_INPUTPASSHINT);
			formData = new FormData();
			formData.left = new FormAttachment(superComposite, 5);
			formData.top = new FormAttachment(superComposite, 5);
			hint.setLayoutData(formData);

			if (dp != null && dp.length > 0) {

				name = new Label[dp.length];
				pass = new Text[dp.length];
				status = new Button[dp.length];

				name[0] = new Label(superComposite, SWT.NONE);
				formData = new FormData();
				formData.left = new FormAttachment(superComposite, 5);
				formData.top = new FormAttachment(hint, 15);
				name[0].setLayoutData(formData);
				name[0].setText(getdpNameLength());
				name[0].pack();
				dpNameLength = name[0].getSize().x;
				oriHeight = name[0].getSize().y;
				formData.width = dpNameLength;
				formData.height = oriHeight;
				name[0].setLayoutData(formData);
				name[0].setText(dp[0].getName().split(DatapoolConstant.DatapoolDialog_SPLITMARK)[0] + ":");

				pass[0] = new Text(superComposite, SWT.PASSWORD | SWT.BORDER);
				formData = new FormData();
				formData.left = new FormAttachment(name[0], 10);
				formData.top = new FormAttachment(hint, 15);
				formData.width = 90;
				formData.height = oriHeight;
				pass[0].setLayoutData(formData);
				pass[0].addKeyListener(this);

				status[0] = new Button(superComposite, SWT.CHECK);
				formData = new FormData();
				formData.left = new FormAttachment(pass[0], 10);
				formData.top = new FormAttachment(hint, 15);
				formData.height = oriHeight;
				status[0].setLayoutData(formData);
				status[0].setSelection(false);
				status[0].setEnabled(false);
				status[0].setVisible(false);

				for (int i = 1; i < dp.length; i++) {
					name[i] = new Label(superComposite, SWT.NONE);
					formData = new FormData();
					formData.left = new FormAttachment(superComposite, 5);
					formData.top = new FormAttachment(name[i - 1], 15);
					formData.width = dpNameLength;
					formData.height = oriHeight;
					name[i].setLayoutData(formData);
					name[i].setText(dp[i].getName().split(DatapoolConstant.DatapoolDialog_SPLITMARK)[0] + ":");

					pass[i] = new Text(superComposite, SWT.PASSWORD
							| SWT.BORDER);
					formData = new FormData();
					formData.left = new FormAttachment(name[i], 10);
					formData.top = new FormAttachment(name[i - 1], 15);
					formData.width = 90;
					formData.height = oriHeight;
					pass[i].setLayoutData(formData);
					pass[i].addKeyListener(this);

					status[i] = new Button(superComposite, SWT.CHECK);
					formData = new FormData();
					formData.left = new FormAttachment(pass[i], 10);
					formData.top = new FormAttachment(name[i - 1], 15);
					formData.height = oriHeight;
					status[i].setLayoutData(formData);
					status[i].setSelection(false);
					status[i].setEnabled(false);
					status[i].setVisible(false);
				}
			}

			superComposite.pack();
			return superComposite;
		}
		
		private void enableOK(){
			// check all the passwords
			for (int i = 0; i < dp.length; i++) {
				try {
					if (status[i].getSelection()) {
						continue;
					} else if (dp[i].getChallenge().equals(
							EncryptionManager.EncoderByMd5(pass[i].getText()))) {
						
						if(passed.get(testId) == null){
							passed.put(testId, new HashMap());
						}
						HashMap thm = (HashMap)passed.get(testId);
						thm.put(dp[i].getName(), pass[i].getText());
						
						pass[i].setEnabled(false);
						status[i].setSelection(true);
						if (unCorrectList != null
								&& unCorrectList.contains(dp[i])) {
							unCorrectList.remove(dp[i]);
						}
					} else {
						pass[i].setText("");
						if (!unCorrectList.contains(dp[i]))
							unCorrectList.add(dp[i]);
					}
				} catch (Exception er) {
					er.printStackTrace();
				}
			}
			// if all status is true, then set ok button can be pressed
			if (unCorrectList.size() == 0) {
				okPressed();
				return;
			}

			StringBuffer toShow = new StringBuffer();
			toShow
					.append(UiPluginResourceBundle.DatapoolDialog_PASSWORDSHINT);
			for (int i = 0; i < unCorrectList.size(); i++) {
				toShow.append(((DPLDatapool) unCorrectList.get(i))
						.getName().split(DatapoolConstant.DatapoolDialog_SPLITMARK)[0]);
				if (i < unCorrectList.size() - 1) {
					toShow.append(",\n");
				}
			}
			toShow.append(UiPluginResourceBundle.DatapoolDialog_TRYAGAIN);

			MessageDialog dialog = new MessageDialog(null,
					UiPluginResourceBundle.DatapoolDialog_NOTALLMATCH, // the dialog title
					null, toShow.toString(), // text to be displayed
					MessageDialog.ERROR, // dialog type
					new String[] { UiPluginResourceBundle.DatapoolDialog_OK }, // button labels
					0);
			dialog.open();
		}

		private String getdpNameLength() {
			
			String datapoolName = "";
			
			for (int counter = 0; counter < dp.length; counter++) {

				if(dp[counter].getName().length() > datapoolName.length()){
					datapoolName = dp[counter].getName();
				}
			}
			
			return datapoolName;
		}

		public void keyPressed(KeyEvent e) {}

		public void keyReleased(KeyEvent e) {
			if(e.keyCode == 13)
			enableOK();			
		}
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolInputKeyDialog.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/
package org.eclipse.hyades.test.ui.datapool.internal.dialog;

import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
 * It's used to provide dialog for key input function .
 * 
 * @author Huang Xin Ying
 * @version February ,27
 */
public class DatapoolInputKeyDialog extends DatapoolBaseDialog implements
		KeyListener {

	private String title;

	private Text logOnField = null;

	private String key = "";
	private Label errorLabel = null;
	private IDatapool datapool = null;

	public DatapoolInputKeyDialog(Shell parentShell, String title, IDatapool datapool) {
		super(parentShell);
		this.title = title;
		this.datapool = datapool;		
	}

	public void keyPressed(KeyEvent e) {
		

	}

	public void keyReleased(KeyEvent e) {
		
		if (logOnField != null) {
			key = logOnField.getText();
		}

	}

	protected Control createDialogArea(Composite parent) {
		getShell().setText(title);
		Composite superComposite = (Composite) super.createDialogArea(parent);
		GridData gridData = GridDataUtil.createFill();
		gridData.minimumWidth = 250;
		superComposite.setLayoutData(gridData);

		GridLayout gridLayout = new GridLayout();
		gridLayout.numColumns = 2;
		superComposite.setLayout(gridLayout);

		Label logOnLabe = new Label(superComposite, SWT.NONE);
		logOnLabe
				.setText(UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE);
		logOnField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
				| SWT.PASSWORD);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		logOnField.setLayoutData(gridData);
		logOnField.addKeyListener(this);
		if (key != null) {
			logOnField.setText(key);
		}
		
		errorLabel = new Label(superComposite,SWT.NONE);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		gridData.horizontalSpan = 2;
		errorLabel.setLayoutData(gridData);
		
		superComposite.pack();
		return superComposite;
	}
	public void okPressed(){
		if (!DatapoolEncryptManager.isKeyCorrect(datapool,key)) {
			showErrMes(UiPluginResourceBundle.DatapoolDialog_WRONGLOGONKEYMES);
		}else{
			super.okPressed();
		}
	}
	public String getKey() {
		return key;
	}
	
	private void showErrMes(String mess){
		Color color= Display.getDefault().getSystemColor(SWT.COLOR_RED);
		errorLabel.setForeground(color);
		errorLabel.setText(mess);
	}

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolChangeKeyDialog.java,v 1.0 2008/01/16 14:42:35 Xin Ying Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/
package org.eclipse.hyades.test.ui.datapool.internal.dialog;

import org.eclipse.hyades.edit.datapool.IDatapool;
import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager;
import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil;
import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
 * It's used to provide dialog for key change function .
 * 
 * @author Huang Xin Ying
 */
public class DatapoolChangeKeyDialog extends DatapoolBaseDialog implements
		ModifyListener {

	private String title = null;
	private Text oldKeyField = null;
	private Text newKeyField = null;
	private Text confirmKeyField = null;
	private String oldKey = null;
	private String newKey = null;
	private String confirmKey = null;
	private Label errorLabel = null;
	private IDatapool datapool = null;

	public DatapoolChangeKeyDialog(Shell parentShell, IDatapool datapool,
			String title) {
		super(parentShell);
		this.datapool = datapool;
		this.title = title;
	}
	
	protected void createButtonsForButtonBar(Composite parent) {
		super.createButtonsForButtonBar(parent);
		getOKButton().setEnabled(false);
	}	

	protected Control createDialogArea(Composite parent) {
		getShell().setText(title);
		Composite superComposite = (Composite) super.createDialogArea(parent);
		GridData gridData = GridDataUtil.createFill();
		gridData.minimumWidth = 250;
		superComposite.setLayoutData(gridData);

		GridLayout gridLayout = new GridLayout();
		gridLayout.numColumns = 2;
		superComposite.setLayout(gridLayout);
		if (title
				.equals(UiPluginResourceBundle.DatapoolDialog_CHANGEKEYDIALOGTITLE)) {
			Label oldKeyLabel = new Label(superComposite, SWT.NONE);
			oldKeyLabel.setText(UiPluginResourceBundle.DatapoolDialog_OLDKEY);
			oldKeyField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
					| SWT.PASSWORD);
			gridData = new GridData(GridData.FILL_HORIZONTAL);
			oldKeyField.setLayoutData(gridData);
			oldKeyField.addModifyListener(this);
		}
		Label newKeyLabel = new Label(superComposite, SWT.NONE);
		newKeyLabel.setText(UiPluginResourceBundle.DatapoolDialog_NEWKEY);
		newKeyField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
				| SWT.PASSWORD);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		newKeyField.setLayoutData(gridData);
		newKeyField.addModifyListener(this);

		Label confirmKeyLabel = new Label(superComposite, SWT.NONE);
		confirmKeyLabel
				.setText(UiPluginResourceBundle.DatapoolDialog_CONFIRMNEWKEY);
		confirmKeyField = new Text(superComposite, SWT.SINGLE | SWT.BORDER
				| SWT.PASSWORD);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		confirmKeyField.setLayoutData(gridData);		
		confirmKeyField.addModifyListener(this);
		
		errorLabel = new Label(superComposite,SWT.NONE);
		gridData = new GridData(GridData.FILL_HORIZONTAL);
		gridData.horizontalSpan = 2;
		errorLabel.setLayoutData(gridData);
		
		superComposite.pack();
		return superComposite;
	}

	public String getOldKey() {
		return oldKey;
	}

	public String getNewKey() {
		return newKey;
	}

	public String getConfirmKey() {
		return confirmKey;
	}	
	
	public void okPressed(){
		int retValue;
		if(title
				.equals(UiPluginResourceBundle.DatapoolDialog_CHANGEKEYDIALOGTITLE))
			retValue = isKeyChangeSuccess(datapool);
		else
			retValue = isKeyAssignSuccess();
		switch(retValue)
		{
		case DatapoolConstant.ORIGINT_KEY_ERROR:
			if(title
					.equals(UiPluginResourceBundle.DatapoolDialog_CHANGEKEYDIALOGTITLE)){
				showErrMes(UiPluginResourceBundle.DatapoolDialog_ORIGINKEYERRORMES);
			}else{
				super.okPressed();
			}
			break;
		case DatapoolConstant.NEW_KEY_NULL:
			showErrMes(UiPluginResourceBundle.DatapoolDialog_NEWKEYNULLMES);
			break;
		case DatapoolConstant.NEW_KEY_NOT_CONFIRM:
			showErrMes(UiPluginResourceBundle.DatapoolDialog_NEWKEYNOTCONFIRMMES);
			break;
		case DatapoolConstant.CHANGE_KEY_SUCCESS:
			super.okPressed();
		}
	}

	public int isKeyChangeSuccess(IDatapool datapool) {
		int retValue = DatapoolConstant.CHANGE_KEY_SUCCESS;
		if (!DatapoolEncryptManager.isKeyCorrect(datapool, oldKey)) {
			retValue = DatapoolConstant.ORIGINT_KEY_ERROR;
		} else if (newKey == null || newKey.equals("")) {
			retValue = DatapoolConstant.NEW_KEY_NULL;
		} else if (!newKey.equals(confirmKey)) {
			retValue = DatapoolConstant.NEW_KEY_NOT_CONFIRM;
		}
		return retValue;

	}

	public int isKeyAssignSuccess() {
		int retValue = DatapoolConstant.CHANGE_KEY_SUCCESS;
		if (newKey == null || newKey.equals("")) {
			retValue = DatapoolConstant.NEW_KEY_NULL;
		} else if (!newKey.equals(confirmKey)) {
			retValue = DatapoolConstant.NEW_KEY_NOT_CONFIRM;
		}
		return retValue;

	}

	public void modifyText(ModifyEvent e) {		
		if (oldKeyField != null) {
			oldKey = oldKeyField.getText();
		}
		if (newKeyField != null) {
			newKey = newKeyField.getText();
		}
		if (confirmKeyField != null) {
			confirmKey = confirmKeyField.getText();
		}
		
		if(newKey!=null	&& !"".equals(newKey) && confirmKey != null && !"".equals(confirmKey)){
			if(title
				.equals(UiPluginResourceBundle.DatapoolDialog_CHANGEKEYDIALOGTITLE)){
				if(oldKey!=null	&& !"".equals(oldKey)){
					getOKButton().setEnabled(true);
				}else{
					getOKButton().setEnabled(false);
				}
			}else{
				getOKButton().setEnabled(true);
			}			
		}else{
			getOKButton().setEnabled(false);
		}
	}
	
	private void showErrMes(String mess){
		Color color= Display.getDefault().getSystemColor(SWT.COLOR_RED);
		errorLabel.setForeground(color);
		errorLabel.setText(mess);
	}

}




/*******************************************************************************
 * Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: HyadesRunner.java,v 1.13 2008/02/27 12:53:02 huangxy Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation

import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;
import org.eclipse.hyades.internal.execution.remote.CustomCommandHandler;
import org.eclipse.hyades.internal.execution.remote.RemoteComponentSkeleton;
import org.eclipse.hyades.models.common.datapool.util.DPLPasswordCollection;
import org.eclipse.hyades.models.common.facades.behavioral.impl.FacadeResourceFactoryImpl;
import org.eclipse.hyades.models.common.testprofile.impl.Common_TestprofilePackageImpl;
import org.eclipse.hyades.test.common.agent.ComptestAgent;
import org.eclipse.hyades.test.common.agent.PrimaryTestAgent;
import org.eclipse.hyades.test.common.agent.ServiceCommandHandler;
import org.eclipse.hyades.test.common.agent.UnknownTestServiceException;
import org.eclipse.hyades.test.common.event.ExecutionEvent;
import org.eclipse.hyades.test.common.testservices.resources.DatapoolPasswordProvider;

/**
 * @author jsutton

				}
			}
		}
		//set password to Models
		try {
			DPLPasswordCollection.getInstance().
			setDatapoolPassword(DatapoolPasswordProvider.getDatapoolPassword(testID));
		} catch (UnknownTestServiceException e) {			
		}

	}
	

	};
	
	public void dispose() {
		//clear the passwords in Models
		DPLPasswordCollection.getInstance().clear();
		if (agent != null && agent.isRegistered()) {
			Runtime.getRuntime().removeShutdownHook(disposeOnExitHook);
			agent.deregister();




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolPasswordProvider.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/
package org.eclipse.hyades.test.common.testservices.resources;

import java.util.HashMap;

import org.eclipse.hyades.test.common.agent.ServiceInvoker;
import org.eclipse.hyades.test.common.agent.UnconfiguredComptestAgentException;
import org.eclipse.hyades.test.common.agent.UnknownTestServiceException;

/**
 * 
 * It's the client of DatapoolPasswordsService ,used to get list of datapool and
 * it's encryption password from workbench side.
 * 
 * @author Huang Xin Ying
 * @version February, 27
 * 
 */
public class DatapoolPasswordProvider {

	protected static final String DATAPOOL_PASSWORD_PROVIDER = "org.eclipse.hyades.test.core.DatapoolPasswordProvider";

	/**
	 * @param testId
	 * @return
	 */
	public static HashMap getDatapoolPassword(String testId)
			throws UnknownTestServiceException {
		String result = null;
		try {

			result = ServiceInvoker.invokeService(getProviderName(),
					"method=getDatapoolList,args:testId={0}".concat(testId));

		} catch (UnconfiguredComptestAgentException e) {
			throw new UnknownTestServiceException(e);
		}

		return parseResult(result);
	}

	/**
	 * @param result
	 * @return
	 */
	private static HashMap parseResult(String result) {
		if (result == null)
			return null;

		HashMap pr = new HashMap();
		if (result.indexOf(";") > 0) {
			String[] pairs = result.split(";");
			for (int i = 0; i < pairs.length; i++) {
				if (pairs[i].indexOf("=")>0) {
					pr.put(pairs[i].split("=")[0], pairs[i].split("=")[1]);
				}
			}
		}

		return pr;
	}

	public static String getProviderName() {
		return DATAPOOL_PASSWORD_PROVIDER;
	}
}

Lines 32-37 Link Here

(-)plugin.xml (+19 lines)
32	<extension-point id="RecorderApplication" name="%RecorderApplication" schema="schema/RecorderAppAdapter.exsd"/>	32	<extension-point id="RecorderApplication" name="%RecorderApplication" schema="schema/RecorderAppAdapter.exsd"/>
33	<extension-point id="Recorder" name="%Recorder" schema="schema/Recorder.exsd"/>	33	<extension-point id="Recorder" name="%Recorder" schema="schema/Recorder.exsd"/>
34	<extension-point id="executionHarnessListener" name="%executionHarnessListener" schema="schema/executionHarnessListener.exsd"/>	34	<extension-point id="executionHarnessListener" name="%executionHarnessListener" schema="schema/executionHarnessListener.exsd"/>
		35	<extension-point id="launchconfigDatapoolHandler" name="%launchconfigDatapoolHandler" schema="schema/launchconfigDatapoolHandler.exsd"/>
		36	<extension-point id="launchDatapoolCheckPass" name="%launchDatapoolCheckPass" schema="schema/launchDatapoolCheckPass.exsd"/>
35		37
36	<extension	38	<extension
37	id="org.eclipse.hyades.execution.harness.RegisteredExecutionComponentImpl.JAVA"	39	id="org.eclipse.hyades.execution.harness.RegisteredExecutionComponentImpl.JAVA"
Lines 216-220 Link Here
216	point="org.eclipse.hyades.execution.testService">	218	point="org.eclipse.hyades.execution.testService">
217	<testService class="org.eclipse.hyades.test.core.testservices.resources.FilesystemResourceProviderService"/>	219	<testService class="org.eclipse.hyades.test.core.testservices.resources.FilesystemResourceProviderService"/>
218	</extension>	220	</extension>
		221	<extension
		222	point="org.eclipse.hyades.test.core.launchconfigDatapoolHandler">
		223	<launchconfigDatapoolHandler
		224	class="org.eclipse.hyades.test.core.internal.launch.datapool.extensions.JUnitLaunchconfigDatapoolHandler">
		225	<supportedTestType
		226	name="org.eclipse.hyades.test.java.junit.testSuite">
		227	</supportedTestType>
		228	</launchconfigDatapoolHandler>
		229	</extension>
		230	<extension
		231	id="DatapoolPasswordProvider"
		232	name="DatapoolPasswordProvider"
		233	point="org.eclipse.hyades.execution.testService">
		234	<testService
		235	class="org.eclipse.hyades.test.core.testservices.resources.DatapoolPasswordsService">
		236	</testService>
		237	</extension>
219		238
220	</plugin>	239	</plugin>

Lines 41-45 Link Here

(-)plugin.properties (-2 / +2 lines)
41	HyadesLaunchConfigurationValidator = Hyades Launch Configuration Validator	41	HyadesLaunchConfigurationValidator = Hyades Launch Configuration Validator
42	ExecutionResultsLocationFilter = Execution Results Location Filter	42	ExecutionResultsLocationFilter = Execution Results Location Filter
43	RecorderApplication = Recorder Application	43	RecorderApplication = Recorder Application
44		44	launchconfigDatapoolHandler = Launch Configuration Datapool Handler
45		45	launchDatapoolCheckPass = Check Encrypted Datapool Password While Launching Tests




/*******************************************************************************
 * Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: AbstractLaunchConfigurationDelegate2.java,v 1.13 2008/02/27 18:49:48 huangxy Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation

package org.eclipse.hyades.test.core.launch.delegates;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;


import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.hyades.execution.core.IExecutor;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.test.core.TestCorePlugin;
import org.eclipse.hyades.test.core.internal.launch.datapool.extensions.LaunchDatapoolExtensionManager;
import org.eclipse.hyades.test.core.internal.launch.extensions.LaunchConfigurationExtensionsManager;
import org.eclipse.hyades.test.core.internal.launch.processes.TestExecutionProcess;
import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;
import org.eclipse.hyades.test.core.launch.configurations.DeploymentLaunchConfigurationFacade;
import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;
import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;
import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;
import org.eclipse.hyades.test.core.launch.extensions.IRunHandler2;
import org.eclipse.hyades.test.core.launch.extensions.ITestLaunchConfigurationValidator;
import org.eclipse.hyades.test.core.testservices.resources.PasswordCollection;
import org.eclipse.osgi.util.NLS;

/**

	    		}
	    	}
			
	    	// find the datapools which is encrypted   	
	    	ILaunchconfigDatapoolHandler datapoolHandler = LaunchDatapoolExtensionManager.getInstance().getRunHandler(getLaunchedElement(configuration));
			DPLDatapool[] dp = null;
			if(datapoolHandler != null){
				dp = datapoolHandler.getAllDatapools(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()), 
						DeploymentLaunchConfigurationFacade.getDeployment(configuration, getResourceSet()));				
			}
			HashMap pass = PasswordCollection.getInstance().getDatapoolPassword();
			
			// show a dialog to collect the passwords
			if(dp!=null && dp.length > 0){
				IPassInfoCollector collector = LaunchDatapoolExtensionManager.getInstance().getCollector(getLaunchedElement(configuration));
				List isContinue = new ArrayList();
				isContinue.add(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()).getImplementor().getId());
				collector.execute(dp, pass, isContinue);
				if(isContinue.size()==0)				
					return;
			}				
			// Invoke the Test Execution Harness
			StringBuffer errorMessages = new StringBuffer();
			IExecutor executor = null;
			try {				
				executor = invokeTestExecutionHarness(configuration, mode, errorMessages, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
				if (errorMessages.length() > 0) {
					IStatus status = new Status(IStatus.ERROR, TestCorePlugin.getPluginId(), 0, TestCorePluginResourceBundle._EXC_AbstractLaunchConfigurationDelegate_testHarnessProblems + errorMessages, null); 

Lines 21-26 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
21	org.eclipse.hyades.test.core,	21	org.eclipse.hyades.test.core,
22	org.eclipse.hyades.test.core.internal,	22	org.eclipse.hyades.test.core.internal,
23	org.eclipse.hyades.test.core.internal.changes,	23	org.eclipse.hyades.test.core.internal.changes,
		24	org.eclipse.hyades.test.core.internal.launch.datapool.extensions,
24	org.eclipse.hyades.test.core.internal.launch.debug,	25	org.eclipse.hyades.test.core.internal.launch.debug,
25	org.eclipse.hyades.test.core.internal.launch.extensions,	26	org.eclipse.hyades.test.core.internal.launch.extensions,
26	org.eclipse.hyades.test.core.internal.launch.processes,	27	org.eclipse.hyades.test.core.internal.launch.processes,

Lines 1-10 Link Here

(-)src/org/eclipse/hyades/test/core/internal/launch/processes/TestExecutionProcess.java (-2 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: TestExecutionProcess.java,v 1.11 2007/03/22 14:42:35 paules Exp $	7	* $Id: TestExecutionProcess.java,v 1.11 2008/02/27 14:42:35 huangxy Exp $
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
Lines 44-49 Link Here
44	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;	44	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;
45	import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;	45	import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;
46	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;	46	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;
		47	import org.eclipse.hyades.test.core.testservices.resources.PasswordCollection;
47		48
48	/**	49	/**
49	* Fake process that represents a Hyades Execution Session. The lifecycle of	50	* Fake process that represents a Hyades Execution Session. The lifecycle of
Lines 146-151 Link Here
146		147
147	protected synchronized void onTerminate() {	148	protected synchronized void onTerminate() {
148	if (!terminated) {	149	if (!terminated) {
		150	//remove the dps and passwords from passwordCollection
		151	PasswordCollection.getInstance().clear(test.getImplementor().getId());
149	// Notify the run handler (if any)	152	// Notify the run handler (if any)
150	IRunHandler runHandler = LaunchConfigurationExtensionsManager.getInstance().getRunHandler(test);	153	IRunHandler runHandler = LaunchConfigurationExtensionsManager.getInstance().getRunHandler(test);
151	if (runHandler != null) {	154	if (runHandler != null) {




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: LaunchDatapoolExtensionManager.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.core.internal.launch.datapool.extensions;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.eclipse.hyades.models.common.testprofile.TPFTest;
import org.eclipse.hyades.test.core.TestCorePlugin;
import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;
import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;

/**
 * It's used to manage extensions for launchconfigDatapoolHandler and 
 * launchDatapoolCheckPass extension points ,based on the type of each test .
 * 
 * @author Huang Xin Ying 
 *  @version February 27, 2008
 *
 */
public class LaunchDatapoolExtensionManager {

	private static LaunchDatapoolExtensionManager instance;
	private Map datapoolHandlerExtensionMap = new HashMap();

    /**
     * Return instance of LaunchDatapoolExtensionManager .
	*/
	public static LaunchDatapoolExtensionManager getInstance() {
		if (instance == null) {
			instance = new LaunchDatapoolExtensionManager();
		}
		return instance;
	}
   
	/**
	 * Register LaunchconfigDatapoolHandler and LaunchDatapoolCheckPass extensions 
	 */
	private LaunchDatapoolExtensionManager() {
		registerDatapoolHandlers();
		registerCheckPass();
	}

	/**
	 * 
	 * @param testElement
	 * @return
	 */
    
	public ILaunchconfigDatapoolHandler getRunHandler(Object testElement) {
		LaunchDatapoolExtensionDescriper ed = getLaunchDatapoolDescriptor(testElement);
		if (ed != null) {
			return ed.getRunHandler();
		}
		return null;
	}
	
	public IPassInfoCollector getCollector(Object testElement) {
		LaunchDatapoolExtensionDescriper ed = getLaunchDatapoolDescriptor(testElement);
		if (ed != null && ed.getCollector()!= null) 
			return ed.getCollector();

		return getExtensionDescriptor("default").getCollector();
	}
   
	/**
	 * Register LaunchconfigDatapoolHandler extensions 
	 */
	private void registerDatapoolHandlers() {
		IExtensionPoint extPoint = Platform.getExtensionRegistry()
				.getExtensionPoint(
						TestCorePlugin.getPluginId()
								+ ".launchconfigDatapoolHandler");
		if (extPoint != null) {
			IConfigurationElement[] datapoolHandlers = extPoint
					.getConfigurationElements();
			for (int i = 0; i < datapoolHandlers.length; i++) {
				IConfigurationElement[] supportedTypes = datapoolHandlers[i]
						.getChildren();
				for (int j = 0; j < supportedTypes.length; j++) {
					String type = supportedTypes[j].getAttribute("name"); //$NON-NLS-1$					
					try {
						LaunchDatapoolExtensionDescriper ed = getExtensionDescriptor(type);
						ed.launchDatapoolConfigElem = datapoolHandlers[i];
					} catch (Exception e) {
						TestCorePlugin
								.getDefault()
								.logError(
										"Extension "
												+ datapoolHandlers[i].getName()
												+ " was ignored. See next messages for details.");
						TestCorePlugin.getDefault().logError(e);
					}
				}
			}
		}
	}
	
	/**
	 * Register LaunchconfigDatapoolHandler extensions 
	 */
	private void registerCheckPass() {
		IExtensionPoint extPoint = Platform.getExtensionRegistry()
				.getExtensionPoint(
						TestCorePlugin.getPluginId()
								+ ".launchDatapoolCheckPass");
		if (extPoint != null) {
			IConfigurationElement[] datapoolHandlers = extPoint
					.getConfigurationElements();
			for (int i = 0; i < datapoolHandlers.length; i++) {
				IConfigurationElement[] supportedTypes = datapoolHandlers[i]
						.getChildren();
				for (int j = 0; j < supportedTypes.length; j++) {
					String type = supportedTypes[j].getAttribute("name"); //$NON-NLS-1$	
					if(type == null || type.equals(""))
						type = "default";
					try {
						LaunchDatapoolExtensionDescriper ed = getExtensionDescriptor(type);
						ed.CheckPassConfigElem = datapoolHandlers[i];
					} catch (Exception e) {
						TestCorePlugin
								.getDefault()
								.logError(
										"Extension "
												+ datapoolHandlers[i].getName()
												+ " was ignored. See next messages for details.");
						TestCorePlugin.getDefault().logError(e);
					}
				}
			}
		}
	}

	private LaunchDatapoolExtensionDescriper getExtensionDescriptor(String type) {

		if (type == null) {
			throw new NullPointerException("Type must be non-null"); //$NON-NLS-1$
		}

		Object o = datapoolHandlerExtensionMap.get(type);
		if (o == null) {
			o = new LaunchDatapoolExtensionDescriper();
			datapoolHandlerExtensionMap.put(type, o);
		}
		return (LaunchDatapoolExtensionDescriper) o;
	}

	private LaunchDatapoolExtensionDescriper getLaunchDatapoolDescriptor(
			Object testElement) {
		if (testElement != null) {
			if (testElement instanceof TPFTest) {
				TPFTest test = (TPFTest) testElement;
				if (test.getType() != null) {
					return getExtensionDescriptor(test.getType());
				}
			}
		}
		return null;
	}

	private class LaunchDatapoolExtensionDescriper {
		public IConfigurationElement launchDatapoolConfigElem = null;
		public IConfigurationElement CheckPassConfigElem = null;
		private ILaunchconfigDatapoolHandler hanler = null;
		private IPassInfoCollector collector = null;
		public String launchConfigurationType = null;

		public ILaunchconfigDatapoolHandler getRunHandler() {
			if (this.hanler == null) {
				if (this.launchDatapoolConfigElem != null) {
					try {
						this.hanler = (ILaunchconfigDatapoolHandler) this.launchDatapoolConfigElem
								.createExecutableExtension("class"); //$NON-NLS-1$
					} catch (CoreException e) {
						TestCorePlugin.getDefault().logError(e);
						this.launchDatapoolConfigElem = null;
					}
				}
			}
			return this.hanler;
		}
		
		public IPassInfoCollector getCollector() {
			if (this.collector == null) {
				if (this.CheckPassConfigElem != null) {
					try {
						this.collector = (IPassInfoCollector) this.CheckPassConfigElem
								.createExecutableExtension("uiClass"); //$NON-NLS-1$
					} catch (CoreException e) {
						TestCorePlugin.getDefault().logError(e);
						this.CheckPassConfigElem = null;
					}
				}
			}
			return this.collector;
		}

		public boolean isLaunchConfigurationTypeSupported(String lcType) {
			return (this.launchConfigurationType == lcType)
					|| (lcType != null && lcType
							.equals(this.launchConfigurationType));
		}
	}
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: ILaunchconfigDatapoolHandler.java,v 1.0 2008/01/16 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.core.launch.extensions;

import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.testprofile.TPFDeployment;
import org.eclipse.hyades.models.common.testprofile.TPFTest;

/**
*  
* It's the interface for the launchconfigDatapoolHandler extension point.
* 
* @author Huang Xin Ying 
*  @version February 27, 2008
*/
public interface ILaunchconfigDatapoolHandler {
	
	/**
	 * Used to get all encrypted datapool's names from TPFTest and TPFDeployment 
	 * while running testsuite.
	 * @param test
	 * @param deploy
	 * @return DPLDatapool[]
	 */
	public	DPLDatapool[] getAllDatapools(TPFTest test, TPFDeployment deploy);

}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: IPassInfoCollector.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.core.launch.extensions;

import java.util.List;
import java.util.Map;

import org.eclipse.hyades.models.common.datapool.DPLDatapool;

/**
*  
* It's the interface for the launchDatapoolCheckPass extension point.
* @author Huang Xin Ying 
*  @version February 27, 2008
*
*/
public interface IPassInfoCollector {
	
	/**
	 * Create a dialog to prompt user input the passwords for encrypted datapools
	 *  while running a test suite .
	 * @param dp
	 * @param pass
	 * @param isContinue
	 */
	void execute(DPLDatapool[] dp, Map pass, List isContinue);
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: PasswordCollection.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.core.testservices.resources;



import java.util.HashMap;

/**
 * This class runs on the workbench, and used to save HashMap of
 *  datapool & password for this datapool during luaching  tests ;
 * It's supposed to support mult-lauch on the workbench side . 
 * @author Xin Ying Huang
 * @version February 27, 2008
 */
public class PasswordCollection {
	
	private static PasswordCollection instance = null;
	private HashMap datapoolPassword = new HashMap();
	
	
	private PasswordCollection(){}
	
	/**
	 * @param 
	 * @return PasswordCollection
	 */
	public static PasswordCollection getInstance(){
		if(instance == null){
			instance = new PasswordCollection();
		}
		return instance;
	}	
   
	/**
	 * @param 
	 * @return HashMap
	 */
	public HashMap getDatapoolPassword() {
		return datapoolPassword;
	}
	
	/**
	 * @param  testId
	 * @return HashMap
	 */
	public HashMap getDatapoolPassword(String testId){
		if(testId == null)
			return null;
		return (HashMap)datapoolPassword.get(testId);
	}
	
	/**
	 * @param  testId
	 * @return HashMap
	 */
	public void clear(String testId){
		if(testId == null)
			return;
		datapoolPassword.remove(testId);
		return;
	}
}




<?xml version='1.0' encoding='UTF-8'?>
<!--
 **********************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: launchconfigDatapoolHandler.exsd,v 1.1 2008/02/27 21:27:06 huangxy Exp $
 * 
 * Contributors: 
 * IBM - Initial API and implementation
 **********************************************************************
 -->
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.hyades.test.core">
<annotation>
      <appInfo>
         <meta.schema plugin="org.eclipse.hyades.test.core" id="launchconfigDatapoolHandler" name="launchconfigDatapoolHandler"/>
      </appInfo>
      <documentation>
         This extension point provides a mechanism to get datapool model for each test type when launching a test case .
      </documentation>
   </annotation>

   <element name="extension">
      <complexType>
         <sequence>
            <element ref="launchconfigDatapoolHandler"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="id" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="name" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
               <appInfo>
                  <meta.attribute translatable="true"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="launchconfigDatapoolHandler">
      <complexType>
         <sequence>
            <element ref="supportedTestType"/>
         </sequence>
         <attribute name="class" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="supportedTestType">
      <complexType>
         <attribute name="name" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="since"/>
      </appInfo>
      <documentation>
         [4.5 ]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="examples"/>
      </appInfo>
      <documentation>
         The following example associates a DatapoolHandler class with tests of type org.eclipse.hyades.test.:

&lt;pre&gt;

 &lt;extension

       point=&quot;org.eclipse.hyades.test.core.launchconfigDatapoolHandler&quot;&gt;

    &lt;launchconfigDatapoolHandler class=&quot; &quot;&gt;

       &lt;supportedType

             name =&quot;  &quot;/&gt;

    &lt;/runHandler&gt;

 &lt;/extension&gt;

&lt;/pre&gt;
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="apiInfo"/>
      </appInfo>
      <documentation>
         [org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="implementation"/>
      </appInfo>
      <documentation>
         [Enter information about supplied implementation of this extension point.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="copyright"/>
      </appInfo>
      <documentation>
         
      </documentation>
   </annotation>

</schema>




<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.hyades.test.core">
<annotation>
      <appInfo>
         <meta.schema plugin="org.eclipse.hyades.test.core" id="launchDatapoolCheckPass" name="check passwords while launching"/>
      </appInfo>
      <documentation>
         [Used to collect password for each enctypted datapool which used in current test on workbench side .]
      </documentation>
   </annotation>

   <element name="extension">
      <complexType>
         <sequence>
            <element ref="launchDatapoolCheckPass"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="id" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="name" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
               <appInfo>
                  <meta.attribute translatable="true"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="launchDatapoolCheckPass">
      <complexType>
         <sequence>
            <element ref="supportedTestType"/>
         </sequence>
         <attribute name="uiClass" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="supportedTestType">
      <complexType>
         <attribute name="name" type="string" use="default" value="">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="since"/>
      </appInfo>
      <documentation>
         [4.5.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="examples"/>
      </appInfo>
      <documentation>
         [  &lt;element name=&quot;extension&quot;&gt;
      &lt;complexType&gt;
         &lt;sequence&gt;
            &lt;element ref=&quot;launchDatapoolCheckPass&quot;/&gt;
         &lt;/sequence&gt;
         &lt;attribute name=&quot;point&quot; type=&quot;string&quot; use=&quot;required&quot;&gt;
            &lt;annotation&gt;
               &lt;documentation&gt;
                  
               &lt;/documentation&gt;
            &lt;/annotation&gt;
         &lt;/attribute&gt;
         &lt;attribute name=&quot;id&quot; type=&quot;string&quot;&gt;
            &lt;annotation&gt;
               &lt;documentation&gt;
                  
               &lt;/documentation&gt;
            &lt;/annotation&gt;
         &lt;/attribute&gt;
         &lt;attribute name=&quot;name&quot; type=&quot;string&quot;&gt;
            &lt;annotation&gt;
               &lt;documentation&gt;
                  
               &lt;/documentation&gt;
               &lt;appInfo&gt;
                  &lt;meta.attribute translatable=&quot;true&quot;/&gt;
               &lt;/appInfo&gt;
            &lt;/annotation&gt;
         &lt;/attribute&gt;
      &lt;/complexType&gt;
   &lt;/element&gt;
.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="apiInfo"/>
      </appInfo>
      <documentation>
         [org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector .]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="implementation"/>
      </appInfo>
      <documentation>
         [Enter information about supplied implementation of this extension point.]
      </documentation>
   </annotation>


</schema>




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: JUnitLaunchconfigDatapoolHandler.java,v 1.0 2008/03/19 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 

package org.eclipse.hyades.test.core.internal.launch.datapool.extensions;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.eclipse.hyades.models.common.configuration.CFGArtifactLocationPair;
import org.eclipse.hyades.models.common.configuration.CFGClass;
import org.eclipse.hyades.models.common.datapool.DPLDatapool;
import org.eclipse.hyades.models.common.testprofile.TPFDeployment;
import org.eclipse.hyades.models.common.testprofile.TPFTest;
import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;


/**
 * This class runs on the workbench, and provides the workbench side 
 * implementation of the launchconfigDatapoolHandler extension point.
 * 
 * It's used to get datapool[] from TPFTest or TPFDeployment for Junit test type .
 * 
 * @author Huang Xin Ying 
 * @version February 27, 2008
 *
 */
public class JUnitLaunchconfigDatapoolHandler implements
		ILaunchconfigDatapoolHandler {
	
	/**
	 * Return Datapool[] from from TPFTest or TPFDeployment while running Junit testsuites .
	 * @param test,deploy
	 * @return DPLDatapool[]
	 */
	public DPLDatapool[] getAllDatapools(TPFTest test, TPFDeployment deploy) {
		if(deploy == null)
			return null;
		
		List keyList = new ArrayList();
		List pairs = deploy.getArtifactLocations();
		
		if(pairs == null)
			return null;
		for(Iterator iti = pairs.iterator();iti.hasNext();){
			CFGArtifactLocationPair aflp = (CFGArtifactLocationPair)iti.next();
			if(aflp == null)
				continue;
			if(aflp.getArtifact() == null)
				continue;
			List deploys = aflp.getArtifact().getDeployableInstances();
			if(deploys == null)
				continue;
			for(Iterator it=deploys.iterator();it.hasNext();){
				CFGClass cfg = (CFGClass)it.next();
				if(cfg instanceof DPLDatapool && ((DPLDatapool)cfg).getChallenge()!= null){					
					keyList.add(cfg);
				}
			}			
		}
		
		if(keyList.size() == 0)			
			return null;		
	
		return (DPLDatapool[])(keyList.toArray(new DPLDatapool[]{}));
	}
}




/********************************************************************** 
 * Copyright (c) 2008 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html         
 * $Id: DatapoolPasswordsService.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.core.testservices.resources;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.eclipse.hyades.execution.local.testservices.AbstractTestService;
import org.eclipse.hyades.execution.local.testservices.ITestService;
import org.eclipse.hyades.internal.execution.local.control.Agent;

/**
*  
* It's the class of DatapoolPasswordsService ,used to provide list of datapool and it's encryption 
* password to the agent controller side .
* @author Huang Xin Ying 
* @version February 27, 2008
*/
public class DatapoolPasswordsService extends AbstractTestService implements ITestService{
	
	/**
	 * @param agent
	 * @param methodArgs
	 * @param errBuf
	 * @return The String  made up by the encrypted datapool's names and it's passwords
	 */
	public String getDatapoolList(Agent agent, String methodArgs, StringBuffer errBuf){
		Pattern pattern = Pattern.compile("testId=(.*)"); //$NON-NLS-1$
		Matcher matcher = pattern.matcher(methodArgs);
		String testId = null;
		if (matcher.find()) {
			testId = matcher.group(1);
		}
		HashMap data = PasswordCollection.getInstance().getDatapoolPassword(testId);
		
		if(data == null || data.size() == 0)
			return null;
		
		StringBuffer result = new StringBuffer();
		
		for( Iterator it = data.entrySet().iterator();it.hasNext();){
			Map.Entry entry = (Map.Entry)it.next();
			result.append(entry.getKey() + "=" + entry.getValue() + ";");
		}
		
		return result.toString();
	}	
}

Return to bug 202695

Lines 32-37 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/DPLVariable.java (-1 / +33 lines)
32	* <ul>	32	* <ul>
33	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getType <em>Type</em>}</li>	33	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getType <em>Type</em>}</li>
34	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getRole <em>Role</em>}</li>	34	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getRole <em>Role</em>}</li>
		35	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}</li>
35	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}</li>	36	* <li>{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}</li>
36	* </ul>	37	* </ul>
37	* </p>	38	* </p>
Lines 40-46 Link Here
40	* @model	41	* @model
41	* @generated	42	* @generated
42	*/	43	*/
43	public interface DPLVariable extends CMNNamedElement, IDatapoolVariable{	44	public interface DPLVariable extends CMNNamedElement, IDatapoolVariable {
44	/**	45	/**
45	* <!-- begin-user-doc -->	46	* <!-- begin-user-doc -->
46	* <!-- end-user-doc -->	47	* <!-- end-user-doc -->
Lines 104-109 Link Here
104	void setRole(DPLRole value);	105	void setRole(DPLRole value);
105		106
106	/**	107	/**
		108	* Returns the value of the '<em><b>Encrypted</b></em>' attribute.
		109	* The default value is <code>"false"</code>.
		110	* <!-- begin-user-doc -->
		111	* <p>
		112	* If the meaning of the '<em>Encrypted</em>' attribute isn't clear,
		113	* there really should be more of a description here...
		114	* </p>
		115	* <!-- end-user-doc -->
		116	* <!-- begin-model-doc -->
		117	* This boolean specifies whether or not this DPLVariable is encrypted.
		118	* <!-- end-model-doc -->
		119	* @return the value of the '<em>Encrypted</em>' attribute.
		120	* @see #setEncrypted(boolean)
		121	* @see org.eclipse.hyades.models.common.datapool.Common_DatapoolPackage#getDPLVariable_Encrypted()
		122	* @model default="false"
		123	* @generated
		124	*/
		125	boolean isEncrypted();
		126
		127	/**
		128	* Sets the value of the '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}' attribute.
		129	* <!-- begin-user-doc -->
		130	* <!-- end-user-doc -->
		131	* @param value the new value of the '<em>Encrypted</em>' attribute.
		132	* @see #isEncrypted()
		133	* @generated
		134	*/
		135	void setEncrypted(boolean value);
		136
		137	/**
107	* Returns the value of the '<em><b>Variables</b></em>' containment reference list.	138	* Returns the value of the '<em><b>Variables</b></em>' containment reference list.
108	* The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLVariable}.	139	* The list contents are of type {@link org.eclipse.hyades.models.common.datapool.DPLVariable}.
109	* <!-- begin-user-doc -->	140	* <!-- begin-user-doc -->
Lines 119-122 Link Here
119	*/	150	*/
120	EList getVariables();	151	EList getVariables();
121		152
		153
122	} // DPLVariable	154	} // DPLVariable

Lines 330-342 Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/Common_DatapoolPackage.java (-5 / +61 lines)
330	int DPL_VARIABLE__ROLE = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 1;	330	int DPL_VARIABLE__ROLE = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 1;
331		331
332	/**	332	/**
		333	* The feature id for the '<em><b>Encrypted</b></em>' attribute.
		334	* <!-- begin-user-doc -->
		335	* <!-- end-user-doc -->
		336	* @generated
		337	* @ordered
		338	*/
		339	int DPL_VARIABLE__ENCRYPTED = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;
		340
		341	/**
333	* The feature id for the '<em><b>Variables</b></em>' containment reference list.	342	* The feature id for the '<em><b>Variables</b></em>' containment reference list.
334	* <!-- begin-user-doc -->	343	* <!-- begin-user-doc -->
335	* <!-- end-user-doc -->	344	* <!-- end-user-doc -->
336	* @generated	345	* @generated
337	* @ordered	346	* @ordered
338	*/	347	*/
339	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 2;	348	int DPL_VARIABLE__VARIABLES = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;
340		349
341	/**	350	/**
342	* The number of structural features of the '<em>DPL Variable</em>' class.	351	* The number of structural features of the '<em>DPL Variable</em>' class.
Lines 345-351 Link Here
345	* @generated	354	* @generated
346	* @ordered	355	* @ordered
347	*/	356	*/
348	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 3;	357	int DPL_VARIABLE_FEATURE_COUNT = CommonPackage.CMN_NAMED_ELEMENT_FEATURE_COUNT + 4;
349		358
350	/**	359	/**
351	* The feature id for the '<em><b>Id</b></em>' attribute.	360	* The feature id for the '<em><b>Id</b></em>' attribute.
Lines 402-414 Link Here
402	int DPL_DATAPOOL__INSTANTIATIONS = Common_ConfigurationPackage.CFG_CLASS__INSTANTIATIONS;	411	int DPL_DATAPOOL__INSTANTIATIONS = Common_ConfigurationPackage.CFG_CLASS__INSTANTIATIONS;
403		412
404	/**	413	/**
		414	* The feature id for the '<em><b>Challenge</b></em>' attribute.
		415	* <!-- begin-user-doc -->
		416	* <!-- end-user-doc -->
		417	* @generated
		418	* @ordered
		419	*/
		420	int DPL_DATAPOOL__CHALLENGE = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;
		421
		422	/**
405	* The feature id for the '<em><b>Equivalence Classes</b></em>' containment reference list.	423	* The feature id for the '<em><b>Equivalence Classes</b></em>' containment reference list.
406	* <!-- begin-user-doc -->	424	* <!-- begin-user-doc -->
407	* <!-- end-user-doc -->	425	* <!-- end-user-doc -->
408	* @generated	426	* @generated
409	* @ordered	427	* @ordered
410	*/	428	*/
411	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 0;	429	int DPL_DATAPOOL__EQUIVALENCE_CLASSES = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;
412		430
413	/**	431	/**
414	* The feature id for the '<em><b>Datapool Spec</b></em>' containment reference.	432	* The feature id for the '<em><b>Datapool Spec</b></em>' containment reference.
Lines 417-423 Link Here
417	* @generated	435	* @generated
418	* @ordered	436	* @ordered
419	*/	437	*/
420	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 1;	438	int DPL_DATAPOOL__DATAPOOL_SPEC = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;
421		439
422	/**	440	/**
423	* The number of structural features of the '<em>DPL Datapool</em>' class.	441	* The number of structural features of the '<em>DPL Datapool</em>' class.
Lines 426-432 Link Here
426	* @generated	444	* @generated
427	* @ordered	445	* @ordered
428	*/	446	*/
429	int DPL_DATAPOOL_FEATURE_COUNT = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 2;	447	int DPL_DATAPOOL_FEATURE_COUNT = Common_ConfigurationPackage.CFG_CLASS_FEATURE_COUNT + 3;
430		448
431	/**	449	/**
432	* The meta object id for the '{@link org.eclipse.hyades.models.common.datapool.DPLRole <em>DPL Role</em>}' enum.	450	* The meta object id for the '{@link org.eclipse.hyades.models.common.datapool.DPLRole <em>DPL Role</em>}' enum.
Lines 471-476 Link Here
471	EClass getDPLDatapool();	489	EClass getDPLDatapool();
472		490
473	/**	491	/**
		492	* Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge <em>Challenge</em>}'.
		493	* <!-- begin-user-doc -->
		494	* <!-- end-user-doc -->
		495	* @return the meta object for the attribute '<em>Challenge</em>'.
		496	* @see org.eclipse.hyades.models.common.datapool.DPLDatapool#getChallenge()
		497	* @see #getDPLDatapool()
		498	* @generated
		499	*/
		500	EAttribute getDPLDatapool_Challenge();
		501
		502	/**
474	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}'.	503	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLDatapool#getEquivalenceClasses <em>Equivalence Classes</em>}'.
475	* <!-- begin-user-doc -->	504	* <!-- begin-user-doc -->
476	* <!-- end-user-doc -->	505	* <!-- end-user-doc -->
Lines 610-615 Link Here
610	EAttribute getDPLVariable_Role();	639	EAttribute getDPLVariable_Role();
611		640
612	/**	641	/**
		642	* Returns the meta object for the attribute '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted <em>Encrypted</em>}'.
		643	* <!-- begin-user-doc -->
		644	* <!-- end-user-doc -->
		645	* @return the meta object for the attribute '<em>Encrypted</em>'.
		646	* @see org.eclipse.hyades.models.common.datapool.DPLVariable#isEncrypted()
		647	* @see #getDPLVariable()
		648	* @generated
		649	*/
		650	EAttribute getDPLVariable_Encrypted();
		651
		652	/**
613	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}'.	653	* Returns the meta object for the containment reference list '{@link org.eclipse.hyades.models.common.datapool.DPLVariable#getVariables <em>Variables</em>}'.
614	* <!-- begin-user-doc -->	654	* <!-- begin-user-doc -->
615	* <!-- end-user-doc -->	655	* <!-- end-user-doc -->
Lines 767-772 Link Here
767	EAttribute DPL_VARIABLE__ROLE = eINSTANCE.getDPLVariable_Role();	807	EAttribute DPL_VARIABLE__ROLE = eINSTANCE.getDPLVariable_Role();
768		808
769	/**	809	/**
		810	* The meta object literal for the '<em><b>Encrypted</b></em>' attribute feature.
		811	* <!-- begin-user-doc -->
		812	* <!-- end-user-doc -->
		813	* @generated
		814	*/
		815	EAttribute DPL_VARIABLE__ENCRYPTED = eINSTANCE.getDPLVariable_Encrypted();
		816
		817	/**
770	* The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.	818	* The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.
771	* <!-- begin-user-doc -->	819	* <!-- begin-user-doc -->
772	* <!-- end-user-doc -->	820	* <!-- end-user-doc -->
Lines 785-790 Link Here
785	EClass DPL_DATAPOOL = eINSTANCE.getDPLDatapool();	833	EClass DPL_DATAPOOL = eINSTANCE.getDPLDatapool();
786		834
787	/**	835	/**
		836	* The meta object literal for the '<em><b>Challenge</b></em>' attribute feature.
		837	* <!-- begin-user-doc -->
		838	* <!-- end-user-doc -->
		839	* @generated
		840	*/
		841	EAttribute DPL_DATAPOOL__CHALLENGE = eINSTANCE.getDPLDatapool_Challenge();
		842
		843	/**
788	* The meta object literal for the '<em><b>Equivalence Classes</b></em>' containment reference list feature.	844	* The meta object literal for the '<em><b>Equivalence Classes</b></em>' containment reference list feature.
789	* <!-- begin-user-doc -->	845	* <!-- begin-user-doc -->
790	* <!-- end-user-doc -->	846	* <!-- end-user-doc -->

Added Link Here

(-)src-test/org/eclipse/hyades/models/common/datapool/util/DatapoolEncryptManager.java (+197 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: DatapoolEncryptManager.java,v 1.0 2008/02/28 14:42:35 huangxy Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12
13	package org.eclipse.hyades.models.common.datapool.util;
14
15	import org.eclipse.hyades.edit.datapool.IDatapool;
16	import org.eclipse.hyades.edit.datapool.IDatapoolCell;
17	import org.eclipse.hyades.edit.datapool.IDatapoolRecord;
18	import org.eclipse.hyades.execution.runtime.datapool.IDatapoolEquivalenceClass;
19	import org.eclipse.hyades.execution.runtime.datapool.IDatapoolVariable;
20	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
21	import org.eclipse.hyades.models.common.datapool.DPLVariable;
22	import org.eclipse.hyades.models.common.util.EncryptionManager;
23	import org.eclipse.hyades.models.plugin.ModelsPlugin;
24
25	/**
26	* It's used to provide functions of encryption for a datapool .
27	*
28	* @author Huang Xin Ying
29	* @version February ,28
30	*/
31	public class DatapoolEncryptManager {
32
33	/**
34	* Used to encrypt the variable in the datapool using password
35	* @param varible
36	* @param key
37	* @param datapool
38	*/
39	public static void encryptedCellInVarible(IDatapoolVariable varible,
40	String key, IDatapool datapool) {
41
42	int index = datapool.getDefaultEquivalenceClassIndex();
43	if (index == -1) {
44
45	return;
46	}
47	IDatapoolEquivalenceClass equivalenceClass = datapool
48	.getEquivalenceClass(index);
49
50	for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
51	IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
52	.getRecord(i);
53	for (int k = 0; k < record.getCellCount(); k++) {
54	IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
55	if (cell.getCellVariable().getId().equals(varible.getId())) {
56	cell.setCellValue(EncryptionManager.encrypt(cell.getStringValue(),
57	key));
58	}
59	}
60	}
61	}
62
63	/**
64	* Decrypt selected variable in the datapool using key
65	* @param varible
66	* @param key
67	* @param datapool
68	*/
69	public static void decryptedCellInVarible(IDatapoolVariable variable,
70	String key, IDatapool datapool) {
71	int index = datapool.getDefaultEquivalenceClassIndex();
72	if (index == -1) {
73	return;
74	}
75	IDatapoolEquivalenceClass equivalenceClass = datapool
76	.getEquivalenceClass(index);
77
78	for (int i = 0; i < equivalenceClass.getRecordCount(); i++) {
79	IDatapoolRecord record = (IDatapoolRecord) equivalenceClass
80	.getRecord(i);
81	for (int k = 0; k < record.getCellCount(); k++) {
82	IDatapoolCell cell = (IDatapoolCell) record.getCell(k);
83	if (cell.getCellVariable().getId().equals(variable.getId())) {
84	cell.setCellValue(EncryptionManager.decrypt(cell.getStringValue(),
85	key));
86	}
87	}
88	}
89	}
90
91	/**
92	* Change key for encrypted datapool;
93	* Decrypt variables in datapool using old key ,then encrypt them using new key
94	* @param newKey
95	* @param datapool
96	*/
97	public static void changeKey(String newKey, IDatapool datapool) {
98	if (!(datapool instanceof DPLDatapool))
99	return;
100	if (newKey == null \|\| newKey.equals(""))
101	((DPLDatapool) datapool).setChallenge(null);
102	else
103	((DPLDatapool) datapool).setChallenge(newKey);
104	}
105
106	/**
107	* Update encrypted variables using new key
108	* @param datapool
109	* @param oldKey
110	* @param newKey
111	*/
112	public static void changeKeyOfEncryptedCell(IDatapool datapool, String oldKey,
113	String newKey) {
114	int variableCount = datapool.getVariableCount();
115	IDatapoolVariable variable = null;
116	for (int i = 0; i < variableCount; i++) {
117	variable = datapool.getVariable(i);
118	if (isVariabelEncrypted(variable)) {
119	decryptedCellInVarible(variable, oldKey, datapool);
120	encryptedCellInVarible(variable, newKey, datapool);
121	}
122	}
123	}
124
125	/**
126	* Decrypt datapool's variables into unencrypted
127	* @param datapool
128	* @param key
129	*/
130	public static void decryptDatapool(IDatapool datapool, String key){
131	int variableCount = datapool.getVariableCount();
132	IDatapoolVariable variable = null;
133	for (int i = 0; i < variableCount; i++) {
134	variable = datapool.getVariable(i);
135	if (isVariabelEncrypted(variable)) {
136	decryptedCellInVarible(variable, key, datapool);
137	}
138	}
139	}
140
141	/**
142	* Encrypt datapool using assigned key
143	* @param datapool
144	* @param key
145	*/
146	public static void encryptDatapool(IDatapool datapool, String key){
147	int variableCount = datapool.getVariableCount();
148	IDatapoolVariable variable = null;
149	for (int i = 0; i < variableCount; i++) {
150	variable = datapool.getVariable(i);
151	if (isVariabelEncrypted(variable)) {
152	encryptedCellInVarible(variable, key, datapool);
153	}
154	}
155	}
156
157	public static boolean isDatapoolEncrypted(IDatapool datapool) {
158	if (!(datapool instanceof DPLDatapool))
159	return false;
160
161	if (((DPLDatapool) datapool).getChallenge() == null
162	\|\| ((DPLDatapool) datapool).getChallenge().equals(""))
163	return false;
164	return true;
165	}
166
167	public static boolean isKeyCorrect(IDatapool datapool, String key) {
168	if (!(datapool instanceof DPLDatapool))
169	return false;
170	if (key == null)
171	return false;
172	boolean flag = false;
173	try {
174	flag = EncryptionManager.EncoderByMd5(key).equals(
175	((DPLDatapool) datapool).getChallenge());
176	} catch (Exception e) {
177	ModelsPlugin.getPlugin().log("invalid key exception occurs");
178	ModelsPlugin.getPlugin().log(e);
179	}
180	return flag;
181
182	}
183
184	public static boolean isVariabelEncrypted(IDatapoolVariable varible) {
185	return (varible instanceof DPLVariable) ? ((DPLVariable) varible)
186	.isEncrypted() : false;
187	}
188
189	public static String encrypt(String content, String pass) {
190	return EncryptionManager.encrypt(content, pass);
191	}
192
193	public static String decrypt(String content, String pass) {
194	return EncryptionManager.decrypt(content, pass);
195	}
196
197	}

Lines 65-72 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/resources/messages.properties (-1 / +24 lines)
65	DatapoolImportWizard_PageTwo_datapoolsGroup=Datapools	65	DatapoolImportWizard_PageTwo_datapoolsGroup=Datapools
66	DatapoolImportWizard_LocationPage_description=Import data from a CSV file to a new datapool.	66	DatapoolImportWizard_LocationPage_description=Import data from a CSV file to a new datapool.
67	DatapoolImportWizard_diffVariableInfoWarning=The variable (column) name or type information in the datapool are different than the CSV file.	67	DatapoolImportWizard_diffVariableInfoWarning=The variable (column) name or type information in the datapool are different than the CSV file.
		68	DatapoolExportWizard_encrypted= {0} is encrypted. Please enter the password.
		69	DatapoolExportWizard_unencrypted= {0} is not encrypted. Press Finish to complete.
68	DatapoolImportWizard_progressMonitor=Importing the CSV file	70	DatapoolImportWizard_progressMonitor=Importing the CSV file
69		71	DatapoolExportWizard_wrongpass=Incorrect password. Please enter the correct password.
		72	DatapoolExportWizard_rightpass=You passed. Check Finish to complete.
		73	DatapoolExportWizard_password= Password for {0}:
		74
		75	DatapoolDialog_CHANGEKEY= &Modify Password
		76	DatapoolDialog_ENCRYPTED= &Encrypt
		77	DatapoolDialog_ASSIGNKEYDIALOGTITLE= Set Password
		78	DatapoolDialog_CHANGEKEYDIALOGTITLE= Change Password
		79	DatapoolDialog_OLDKEY= &Old Password:
		80	DatapoolDialog_NEWKEY= &New Password:
		81	DatapoolDialog_CONFIRMNEWKEY= &Confirm New Password:
		82	DatapoolDialog_ORIGINKEYERRORMES= The old password is incorrect.
		83	DatapoolDialog_NEWKEYNULLMES= The new password should not be null
		84	DatapoolDialog_NEWKEYNOTCONFIRMMES= The passwords you typed do not match.
		85	DatapoolDialog_WRONGLOGONKEYMES= The password you typed is incorrect.
		86	DatapoolDialog_ERRORDIALOGTITLE=Error
		87	DatapoolDialog_INPUTKEYDIALGOTITLE= Enter Password
		88	DatapoolDialog_OK=OK
		89	DatapoolDialog_PASSWORDSHINT= The password is not correct for each of the following encrypted datapools:\n\n
		90	DatapoolDialog_TRYAGAIN=\n\nPlease try again or Cancel
		91	DatapoolDialog_NOTALLMATCH=Passwords not all matched!
		92	DatapoolDialog_INPUTPASSHINT= Please enter the password for each of the following encrypted datapools:
70	ToggleViewAction_resource_label=Resource test navigator	93	ToggleViewAction_resource_label=Resource test navigator
71	ToggleViewAction_resource_description=Show the resource test navigator	94	ToggleViewAction_resource_description=Show the resource test navigator
72	ToggleViewAction_resource_tooltip=Show the resource test navigator	95	ToggleViewAction_resource_tooltip=Show the resource test navigator

Lines 70-76 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/resources/UiPluginResourceBundle.java (+25 lines)
70	public static String DatapoolImportWizard_PageTwo_useExistingButton;	70	public static String DatapoolImportWizard_PageTwo_useExistingButton;
71	public static String DatapoolImportWizard_PageTwo_datapoolsGroup;	71	public static String DatapoolImportWizard_PageTwo_datapoolsGroup;
72	public static String DatapoolImportWizard_diffVariableInfoWarning;	72	public static String DatapoolImportWizard_diffVariableInfoWarning;
		73	public static String DatapoolImportWizard_editOrSelectDatapool;
		74	public static String DatapoolImportWizard_selectCSV;
		75	public static String DatapoolImportWizard_selectDatapool;
		76	public static String DatapoolExportWizard_encrypted;
		77	public static String DatapoolExportWizard_unencrypted;
73	public static String DatapoolImportWizard_progressMonitor;	78	public static String DatapoolImportWizard_progressMonitor;
		79	public static String DatapoolExportWizard_wrongpass;
		80	public static String DatapoolExportWizard_password;
		81	public static String DatapoolDialog_CHANGEKEY;
		82	public static String DatapoolDialog_ENCRYPTED;
		83	public static String DatapoolDialog_ASSIGNKEYDIALOGTITLE;
		84	public static String DatapoolDialog_CHANGEKEYDIALOGTITLE;
		85	public static String DatapoolDialog_OLDKEY;
		86	public static String DatapoolDialog_NEWKEY;
		87	public static String DatapoolDialog_CONFIRMNEWKEY;
		88	public static String DatapoolDialog_ORIGINKEYERRORMES;
		89	public static String DatapoolDialog_NEWKEYNULLMES;
		90	public static String DatapoolDialog_NEWKEYNOTCONFIRMMES;
		91	public static String DatapoolDialog_WRONGLOGONKEYMES;
		92	public static String DatapoolDialog_ERRORDIALOGTITLE;
		93	public static String DatapoolDialog_INPUTKEYDIALGOTITLE;
		94	public static String DatapoolDialog_OK;
		95	public static String DatapoolDialog_PASSWORDSHINT;
		96	public static String DatapoolDialog_TRYAGAIN;
		97	public static String DatapoolDialog_NOTALLMATCH;
		98	public static String DatapoolDialog_INPUTPASSHINT;
74	public static String ToggleViewAction_resource_label;	99	public static String ToggleViewAction_resource_label;
75	public static String ToggleViewAction_resource_description;	100	public static String ToggleViewAction_resource_description;
76	public static String ToggleViewAction_resource_tooltip;	101	public static String ToggleViewAction_resource_tooltip;

Added Link Here

(-)src/org/eclipse/hyades/test/ui/dialog/DatapoolCheck.java (+354 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: DatapoolCheck.java,v 1.0 2008/02/18 14:42:35 huangxy Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12	package org.eclipse.hyades.test.ui.dialog;
13
14	import java.util.ArrayList;
15	import java.util.HashMap;
16	import java.util.List;
17	import java.util.Map;
18
19	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
20	import org.eclipse.hyades.models.common.util.EncryptionManager;
21	import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
22	import org.eclipse.hyades.test.ui.datapool.internal.dialog.DatapoolConstant;
23	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
24	import org.eclipse.jface.dialogs.Dialog;
25	import org.eclipse.jface.dialogs.IDialogConstants;
26	import org.eclipse.jface.dialogs.MessageDialog;
27	import org.eclipse.swt.SWT;
28	import org.eclipse.swt.events.KeyEvent;
29	import org.eclipse.swt.events.KeyListener;
30	import org.eclipse.swt.events.MouseAdapter;
31	import org.eclipse.swt.events.MouseEvent;
32	import org.eclipse.swt.layout.FormAttachment;
33	import org.eclipse.swt.layout.FormData;
34	import org.eclipse.swt.layout.FormLayout;
35	import org.eclipse.swt.widgets.Button;
36	import org.eclipse.swt.widgets.Composite;
37	import org.eclipse.swt.widgets.Control;
38	import org.eclipse.swt.widgets.Display;
39	import org.eclipse.swt.widgets.Label;
40	import org.eclipse.swt.widgets.Shell;
41	import org.eclipse.swt.widgets.Text;
42
43	/**
44	*
45	* It's the implementation of launchDatapoolCheckPass extension point , provide
46	* dialog to prompt user input password for encrypted datapool during launching a test
47	* on workbench side .
48	*
49	* @author Huang Xin Ying
50	* @version February 28, 2008
51	*/
52	public class DatapoolCheck implements IPassInfoCollector {
53
54	public DatapoolCheck() {
55	}
56
57	/**
58	* Create a dialog to prompt user input the passwords for encrypted datapools
59	* while running a test suite .
60	* @param dp
61	* @param pass
62	* @pass isContinue
63	*/
64	public void execute(DPLDatapool[] dp, Map pass, List isContinue) {
65	DialogRun dr = new DialogRun();
66	dr.setDp(dp);
67	dr.setContinue(isContinue);
68	dr.setPass(pass);
69	Display.getDefault().syncExec(dr);
70	}
71
72	private class DialogRun implements Runnable {
73	private DPLDatapool[] dp;
74	private Map pass;
75	private List isContinue;
76
77	public void setDp(DPLDatapool[] dp) {
78	this.dp = dp;
79	}
80
81	public void setPass(Map pass) {
82	this.pass = pass;
83	}
84
85	public void setContinue(List isContinue) {
86	this.isContinue = isContinue;
87	}
88
89	public void run() {
90	String testId = null;
91	if(isContinue != null && isContinue.size() == 1){
92	testId = (String)isContinue.get(0);
93	isContinue.clear();
94	}
95	DatapoolCheckDialog db = new DatapoolCheckDialog(null,
96	dp,
97	UiPluginResourceBundle.DatapoolDialog_INPUTKEYDIALGOTITLE,
98	pass,
99	testId);
100	db.setBlockOnOpen(true);
101	if (db.open() == IDialogConstants.OK_ID) {
102	isContinue.add(DatapoolConstant.DatapoolDialog_TRUE);
103	}
104	}
105	}
106
107
108	private class DatapoolCheckDialog extends Dialog implements KeyListener {
109	private Button okButton;
110
111	private Button checkButton;
112
113	private DPLDatapool[] dp;
114	private String title;
115	private int dpNameLength = 0;
116	private int oriHeight = 0;
117	private Label[] name;
118	private Text[] pass;
119	private Button[] status;
120	private List unCorrectList = new ArrayList();
121	private Map passed;
122	private String testId;
123
124	/**
125	* @param parentShell
126	*/
127	public DatapoolCheckDialog(Shell parentShell) {
128	super(parentShell);
129	}
130
131	public DatapoolCheckDialog(Shell parentShell, DPLDatapool[] dp,
132	String title, Map passed,String testId) {
133	super(parentShell);
134	this.dp = dp;
135	this.title = title;
136	this.passed = passed;
137	this.testId = testId;
138	}
139
140	/*
141	* (non-Javadoc)
142	*
143	* @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
144	*/
145	protected void createButtonsForButtonBar(Composite parent) {
146	// create OK and Cancel buttons by default
147	okButton = createButton(parent, IDialogConstants.OK_ID,
148	IDialogConstants.OK_LABEL, true);
149	checkButton = createButton(parent, IDialogConstants.YES_ID,
150	IDialogConstants.YES_LABEL, false);
151	checkButton.setText(UiPluginResourceBundle.DatapoolDialog_OK);
152	checkButton.addMouseListener(new MouseAdapter() {
153	public void mouseDown(MouseEvent e) {
154	enableOK();
155	}
156	});
157
158	createButton(parent, IDialogConstants.CANCEL_ID,
159	IDialogConstants.CANCEL_LABEL, false);
160	okButton.setVisible(false);
161	}
162
163	/*
164	* (non-Javadoc)
165	*
166	* @see org.eclipse.jface.dialogs.Dialog#getButton(int)
167	*/
168	protected Button getButton(int id) {
169	if (id == IDialogConstants.OK_ID)
170	return okButton;
171	return super.getButton(id);
172	}
173
174	/*
175	* (non-Javadoc)
176	*
177	* @see org.eclipse.jface.dialogs.Dialog#getOKButton()
178	*/
179	protected Button getOKButton() {
180	return okButton;
181	}
182
183	/* modified the content */
184	protected Control createDialogArea(Composite parent) {
185	getShell().setText(title);
186	Composite superComposite = (Composite) super
187	.createDialogArea(parent);
188
189	superComposite.setLayout(new FormLayout());
190
191	FormData formData;
192
193	Label hint = new Label(superComposite, SWT.NULL);
194	hint.setText(UiPluginResourceBundle.DatapoolDialog_INPUTPASSHINT);
195	formData = new FormData();
196	formData.left = new FormAttachment(superComposite, 5);
197	formData.top = new FormAttachment(superComposite, 5);
198	hint.setLayoutData(formData);
199
200	if (dp != null && dp.length > 0) {
201
202	name = new Label[dp.length];
203	pass = new Text[dp.length];
204	status = new Button[dp.length];
205
206	name[0] = new Label(superComposite, SWT.NONE);
207	formData = new FormData();
208	formData.left = new FormAttachment(superComposite, 5);
209	formData.top = new FormAttachment(hint, 15);
210	name[0].setLayoutData(formData);
211	name[0].setText(getdpNameLength());
212	name[0].pack();
213	dpNameLength = name[0].getSize().x;
214	oriHeight = name[0].getSize().y;
215	formData.width = dpNameLength;
216	formData.height = oriHeight;
217	name[0].setLayoutData(formData);
218	name[0].setText(dp[0].getName().split(DatapoolConstant.DatapoolDialog_SPLITMARK)[0] + ":");
219
220	pass[0] = new Text(superComposite, SWT.PASSWORD \| SWT.BORDER);
221	formData = new FormData();
222	formData.left = new FormAttachment(name[0], 10);
223	formData.top = new FormAttachment(hint, 15);
224	formData.width = 90;
225	formData.height = oriHeight;
226	pass[0].setLayoutData(formData);
227	pass[0].addKeyListener(this);
228
229	status[0] = new Button(superComposite, SWT.CHECK);
230	formData = new FormData();
231	formData.left = new FormAttachment(pass[0], 10);
232	formData.top = new FormAttachment(hint, 15);
233	formData.height = oriHeight;
234	status[0].setLayoutData(formData);
235	status[0].setSelection(false);
236	status[0].setEnabled(false);
237	status[0].setVisible(false);
238
239	for (int i = 1; i < dp.length; i++) {
240	name[i] = new Label(superComposite, SWT.NONE);
241	formData = new FormData();
242	formData.left = new FormAttachment(superComposite, 5);
243	formData.top = new FormAttachment(name[i - 1], 15);
244	formData.width = dpNameLength;
245	formData.height = oriHeight;
246	name[i].setLayoutData(formData);
247	name[i].setText(dp[i].getName().split(DatapoolConstant.DatapoolDialog_SPLITMARK)[0] + ":");
248
249	pass[i] = new Text(superComposite, SWT.PASSWORD
250	\| SWT.BORDER);
251	formData = new FormData();
252	formData.left = new FormAttachment(name[i], 10);
253	formData.top = new FormAttachment(name[i - 1], 15);
254	formData.width = 90;
255	formData.height = oriHeight;
256	pass[i].setLayoutData(formData);
257	pass[i].addKeyListener(this);
258
259	status[i] = new Button(superComposite, SWT.CHECK);
260	formData = new FormData();
261	formData.left = new FormAttachment(pass[i], 10);
262	formData.top = new FormAttachment(name[i - 1], 15);
263	formData.height = oriHeight;
264	status[i].setLayoutData(formData);
265	status[i].setSelection(false);
266	status[i].setEnabled(false);
267	status[i].setVisible(false);
268	}
269	}
270
271	superComposite.pack();
272	return superComposite;
273	}
274
275	private void enableOK(){
276	// check all the passwords
277	for (int i = 0; i < dp.length; i++) {
278	try {
279	if (status[i].getSelection()) {
280	continue;
281	} else if (dp[i].getChallenge().equals(
282	EncryptionManager.EncoderByMd5(pass[i].getText()))) {
283
284	if(passed.get(testId) == null){
285	passed.put(testId, new HashMap());
286	}
287	HashMap thm = (HashMap)passed.get(testId);
288	thm.put(dp[i].getName(), pass[i].getText());
289
290	pass[i].setEnabled(false);
291	status[i].setSelection(true);
292	if (unCorrectList != null
293	&& unCorrectList.contains(dp[i])) {
294	unCorrectList.remove(dp[i]);
295	}
296	} else {
297	pass[i].setText("");
298	if (!unCorrectList.contains(dp[i]))
299	unCorrectList.add(dp[i]);
300	}
301	} catch (Exception er) {
302	er.printStackTrace();
303	}
304	}
305	// if all status is true, then set ok button can be pressed
306	if (unCorrectList.size() == 0) {
307	okPressed();
308	return;
309	}
310
311	StringBuffer toShow = new StringBuffer();
312	toShow
313	.append(UiPluginResourceBundle.DatapoolDialog_PASSWORDSHINT);
314	for (int i = 0; i < unCorrectList.size(); i++) {
315	toShow.append(((DPLDatapool) unCorrectList.get(i))
316	.getName().split(DatapoolConstant.DatapoolDialog_SPLITMARK)[0]);
317	if (i < unCorrectList.size() - 1) {
318	toShow.append(",\n");
319	}
320	}
321	toShow.append(UiPluginResourceBundle.DatapoolDialog_TRYAGAIN);
322
323	MessageDialog dialog = new MessageDialog(null,
324	UiPluginResourceBundle.DatapoolDialog_NOTALLMATCH, // the dialog title
325	null, toShow.toString(), // text to be displayed
326	MessageDialog.ERROR, // dialog type
327	new String[] { UiPluginResourceBundle.DatapoolDialog_OK }, // button labels
328	0);
329	dialog.open();
330	}
331
332	private String getdpNameLength() {
333
334	String datapoolName = "";
335
336	for (int counter = 0; counter < dp.length; counter++) {
337
338	if(dp[counter].getName().length() > datapoolName.length()){
339	datapoolName = dp[counter].getName();
340	}
341	}
342
343	return datapoolName;
344	}
345
346	public void keyPressed(KeyEvent e) {}
347
348	public void keyReleased(KeyEvent e) {
349	if(e.keyCode == 13)
350	enableOK();
351	}
352	}
353
354	}

Lines 1-10 Link Here

(-)src-common-runner/org/eclipse/hyades/test/common/runner/HyadesRunner.java (-2 / +13 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: HyadesRunner.java,v 1.13 2007/04/26 12:53:02 paules Exp $	7	* $Id: HyadesRunner.java,v 1.13 2008/02/27 12:53:02 huangxy Exp $
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
Lines 22-33 Link Here
22	import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;	22	import org.eclipse.hyades.internal.execution.remote.AgentControllerUnavailableException;
23	import org.eclipse.hyades.internal.execution.remote.CustomCommandHandler;	23	import org.eclipse.hyades.internal.execution.remote.CustomCommandHandler;
24	import org.eclipse.hyades.internal.execution.remote.RemoteComponentSkeleton;	24	import org.eclipse.hyades.internal.execution.remote.RemoteComponentSkeleton;
		25	import org.eclipse.hyades.models.common.datapool.util.DPLPasswordCollection;
25	import org.eclipse.hyades.models.common.facades.behavioral.impl.FacadeResourceFactoryImpl;	26	import org.eclipse.hyades.models.common.facades.behavioral.impl.FacadeResourceFactoryImpl;
26	import org.eclipse.hyades.models.common.testprofile.impl.Common_TestprofilePackageImpl;	27	import org.eclipse.hyades.models.common.testprofile.impl.Common_TestprofilePackageImpl;
27	import org.eclipse.hyades.test.common.agent.ComptestAgent;	28	import org.eclipse.hyades.test.common.agent.ComptestAgent;
28	import org.eclipse.hyades.test.common.agent.PrimaryTestAgent;	29	import org.eclipse.hyades.test.common.agent.PrimaryTestAgent;
29	import org.eclipse.hyades.test.common.agent.ServiceCommandHandler;	30	import org.eclipse.hyades.test.common.agent.ServiceCommandHandler;
		31	import org.eclipse.hyades.test.common.agent.UnknownTestServiceException;
30	import org.eclipse.hyades.test.common.event.ExecutionEvent;	32	import org.eclipse.hyades.test.common.event.ExecutionEvent;
		33	import org.eclipse.hyades.test.common.testservices.resources.DatapoolPasswordProvider;
31		34
32	/**	35	/**
33	* @author jsutton	36	* @author jsutton
Lines 234-239 Link Here
234	}	237	}
235	}	238	}
236	}	239	}
		240	//set password to Models
		241	try {
		242	DPLPasswordCollection.getInstance().
		243	setDatapoolPassword(DatapoolPasswordProvider.getDatapoolPassword(testID));
		244	} catch (UnknownTestServiceException e) {
		245	}
237		246
238	}	247	}
239		248
Lines 246-251 Link Here
246	};	255	};
247		256
248	public void dispose() {	257	public void dispose() {
		258	//clear the passwords in Models
		259	DPLPasswordCollection.getInstance().clear();
249	if (agent != null && agent.isRegistered()) {	260	if (agent != null && agent.isRegistered()) {
250	Runtime.getRuntime().removeShutdownHook(disposeOnExitHook);	261	Runtime.getRuntime().removeShutdownHook(disposeOnExitHook);
251	agent.deregister();	262	agent.deregister();

Lines 1-10 Link Here

(-)src/org/eclipse/hyades/test/core/launch/delegates/AbstractLaunchConfigurationDelegate2.java (-3 / +29 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2007 ,2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: AbstractLaunchConfigurationDelegate2.java,v 1.12 2007/04/26 18:49:48 paules Exp $	7	* $Id: AbstractLaunchConfigurationDelegate2.java,v 1.13 2008/02/27 18:49:48 huangxy Exp $
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
Lines 12-17 Link Here
12	package org.eclipse.hyades.test.core.launch.delegates;	12	package org.eclipse.hyades.test.core.launch.delegates;
13		13
14	import java.util.ArrayList;	14	import java.util.ArrayList;
		15	import java.util.HashMap;
15	import java.util.Iterator;	16	import java.util.Iterator;
16	import java.util.List;	17	import java.util.List;
17		18
Lines 27-39 Link Here
27	import org.eclipse.emf.ecore.resource.ResourceSet;	28	import org.eclipse.emf.ecore.resource.ResourceSet;
28	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;	29	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
29	import org.eclipse.hyades.execution.core.IExecutor;	30	import org.eclipse.hyades.execution.core.IExecutor;
		31	import org.eclipse.hyades.models.common.datapool.DPLDatapool;
30	import org.eclipse.hyades.test.core.TestCorePlugin;	32	import org.eclipse.hyades.test.core.TestCorePlugin;
		33	import org.eclipse.hyades.test.core.internal.launch.datapool.extensions.LaunchDatapoolExtensionManager;
31	import org.eclipse.hyades.test.core.internal.launch.extensions.LaunchConfigurationExtensionsManager;	34	import org.eclipse.hyades.test.core.internal.launch.extensions.LaunchConfigurationExtensionsManager;
32	import org.eclipse.hyades.test.core.internal.launch.processes.TestExecutionProcess;	35	import org.eclipse.hyades.test.core.internal.launch.processes.TestExecutionProcess;
33	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;	36	import org.eclipse.hyades.test.core.internal.resources.TestCorePluginResourceBundle;
		37	import org.eclipse.hyades.test.core.launch.configurations.DeploymentLaunchConfigurationFacade;
		38	import org.eclipse.hyades.test.core.launch.configurations.TestLaunchConfigurationFacade;
		39	import org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler;
		40	import org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector;
34	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;	41	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler;
35	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler2;	42	import org.eclipse.hyades.test.core.launch.extensions.IRunHandler2;
36	import org.eclipse.hyades.test.core.launch.extensions.ITestLaunchConfigurationValidator;	43	import org.eclipse.hyades.test.core.launch.extensions.ITestLaunchConfigurationValidator;
		44	import org.eclipse.hyades.test.core.testservices.resources.PasswordCollection;
37	import org.eclipse.osgi.util.NLS;	45	import org.eclipse.osgi.util.NLS;
38		46
39	/**	47	/**
Lines 185-194 Link Here
185	}	193	}
186	}	194	}
187		195
		196	// find the datapools which is encrypted
		197	ILaunchconfigDatapoolHandler datapoolHandler = LaunchDatapoolExtensionManager.getInstance().getRunHandler(getLaunchedElement(configuration));
		198	DPLDatapool[] dp = null;
		199	if(datapoolHandler != null){
		200	dp = datapoolHandler.getAllDatapools(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()),
		201	DeploymentLaunchConfigurationFacade.getDeployment(configuration, getResourceSet()));
		202	}
		203	HashMap pass = PasswordCollection.getInstance().getDatapoolPassword();
		204
		205	// show a dialog to collect the passwords
		206	if(dp!=null && dp.length > 0){
		207	IPassInfoCollector collector = LaunchDatapoolExtensionManager.getInstance().getCollector(getLaunchedElement(configuration));
		208	List isContinue = new ArrayList();
		209	isContinue.add(TestLaunchConfigurationFacade.getTest(configuration, getResourceSet()).getImplementor().getId());
		210	collector.execute(dp, pass, isContinue);
		211	if(isContinue.size()==0)
		212	return;
		213	}
188	// Invoke the Test Execution Harness	214	// Invoke the Test Execution Harness
189	StringBuffer errorMessages = new StringBuffer();	215	StringBuffer errorMessages = new StringBuffer();
190	IExecutor executor = null;	216	IExecutor executor = null;
191	try {	217	try {
192	executor = invokeTestExecutionHarness(configuration, mode, errorMessages, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));	218	executor = invokeTestExecutionHarness(configuration, mode, errorMessages, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
193	if (errorMessages.length() > 0) {	219	if (errorMessages.length() > 0) {
194	IStatus status = new Status(IStatus.ERROR, TestCorePlugin.getPluginId(), 0, TestCorePluginResourceBundle._EXC_AbstractLaunchConfigurationDelegate_testHarnessProblems + errorMessages, null);	220	IStatus status = new Status(IStatus.ERROR, TestCorePlugin.getPluginId(), 0, TestCorePluginResourceBundle._EXC_AbstractLaunchConfigurationDelegate_testHarnessProblems + errorMessages, null);

Added Link Here

(-)src/org/eclipse/hyades/test/core/testservices/resources/PasswordCollection.java (+73 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: PasswordCollection.java,v 1.0 2008/02/27 14:42:35 huangxy Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12
13	package org.eclipse.hyades.test.core.testservices.resources;
14
15
16
17	import java.util.HashMap;
18
19	/**
20	* This class runs on the workbench, and used to save HashMap of
21	* datapool & password for this datapool during luaching tests ;
22	* It's supposed to support mult-lauch on the workbench side .
23	* @author Xin Ying Huang
24	* @version February 27, 2008
25	*/
26	public class PasswordCollection {
27
28	private static PasswordCollection instance = null;
29	private HashMap datapoolPassword = new HashMap();
30
31
32	private PasswordCollection(){}
33
34	/**
35	* @param
36	* @return PasswordCollection
37	*/
38	public static PasswordCollection getInstance(){
39	if(instance == null){
40	instance = new PasswordCollection();
41	}
42	return instance;
43	}
44
45	/**
46	* @param
47	* @return HashMap
48	*/
49	public HashMap getDatapoolPassword() {
50	return datapoolPassword;
51	}
52
53	/**
54	* @param testId
55	* @return HashMap
56	*/
57	public HashMap getDatapoolPassword(String testId){
58	if(testId == null)
59	return null;
60	return (HashMap)datapoolPassword.get(testId);
61	}
62
63	/**
64	* @param testId
65	* @return HashMap
66	*/
67	public void clear(String testId){
68	if(testId == null)
69	return;
70	datapoolPassword.remove(testId);
71	return;
72	}
73	}

Added Link Here

(-)schema/launchconfigDatapoolHandler.exsd (+148 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2	<!--
3	**********************************************************************
4	* Copyright (c) 2008 IBM Corporation and others.
5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at
8	* http://www.eclipse.org/legal/epl-v10.html
9	* $Id: launchconfigDatapoolHandler.exsd,v 1.1 2008/02/27 21:27:06 huangxy Exp $
10	*
11	* Contributors:
12	* IBM - Initial API and implementation
13	**********************************************************************
14	-->
15	<!-- Schema file written by PDE -->
16	<schema targetNamespace="org.eclipse.hyades.test.core">
17	<annotation>
18	<appInfo>
19	<meta.schema plugin="org.eclipse.hyades.test.core" id="launchconfigDatapoolHandler" name="launchconfigDatapoolHandler"/>
20	</appInfo>
21	<documentation>
22	This extension point provides a mechanism to get datapool model for each test type when launching a test case .
23	</documentation>
24	</annotation>
25
26	<element name="extension">
27	<complexType>
28	<sequence>
29	<element ref="launchconfigDatapoolHandler"/>
30	</sequence>
31	<attribute name="point" type="string" use="required">
32	<annotation>
33	<documentation>
34
35	</documentation>
36	</annotation>
37	</attribute>
38	<attribute name="id" type="string">
39	<annotation>
40	<documentation>
41
42	</documentation>
43	</annotation>
44	</attribute>
45	<attribute name="name" type="string">
46	<annotation>
47	<documentation>
48
49	</documentation>
50	<appInfo>
51	<meta.attribute translatable="true"/>
52	</appInfo>
53	</annotation>
54	</attribute>
55	</complexType>
56	</element>
57
58	<element name="launchconfigDatapoolHandler">
59	<complexType>
60	<sequence>
61	<element ref="supportedTestType"/>
62	</sequence>
63	<attribute name="class" type="string" use="required">
64	<annotation>
65	<documentation>
66
67	</documentation>
68	</annotation>
69	</attribute>
70	</complexType>
71	</element>
72
73	<element name="supportedTestType">
74	<complexType>
75	<attribute name="name" type="string" use="required">
76	<annotation>
77	<documentation>
78
79	</documentation>
80	</annotation>
81	</attribute>
82	</complexType>
83	</element>
84
85	<annotation>
86	<appInfo>
87	<meta.section type="since"/>
88	</appInfo>
89	<documentation>
90	[4.5 ]
91	</documentation>
92	</annotation>
93
94	<annotation>
95	<appInfo>
96	<meta.section type="examples"/>
97	</appInfo>
98	<documentation>
99	The following example associates a DatapoolHandler class with tests of type org.eclipse.hyades.test.:
100
101	<pre>
102
103	<extension
104
105	point="org.eclipse.hyades.test.core.launchconfigDatapoolHandler">
106
107	<launchconfigDatapoolHandler class=" ">
108
109	<supportedType
110
111	name =" "/>
112
113	</runHandler>
114
115	</extension>
116
117	</pre>
118	</documentation>
119	</annotation>
120
121	<annotation>
122	<appInfo>
123	<meta.section type="apiInfo"/>
124	</appInfo>
125	<documentation>
126	[org.eclipse.hyades.test.core.launch.extensions.ILaunchconfigDatapoolHandler]
127	</documentation>
128	</annotation>
129
130	<annotation>
131	<appInfo>
132	<meta.section type="implementation"/>
133	</appInfo>
134	<documentation>
135	[Enter information about supplied implementation of this extension point.]
136	</documentation>
137	</annotation>
138
139	<annotation>
140	<appInfo>
141	<meta.section type="copyright"/>
142	</appInfo>
143	<documentation>
144
145	</documentation>
146	</annotation>
147
148	</schema>

Added Link Here

(-)schema/launchDatapoolCheckPass.exsd (+140 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2	<!-- Schema file written by PDE -->
3	<schema targetNamespace="org.eclipse.hyades.test.core">
4	<annotation>
5	<appInfo>
6	<meta.schema plugin="org.eclipse.hyades.test.core" id="launchDatapoolCheckPass" name="check passwords while launching"/>
7	</appInfo>
8	<documentation>
9	[Used to collect password for each enctypted datapool which used in current test on workbench side .]
10	</documentation>
11	</annotation>
12
13	<element name="extension">
14	<complexType>
15	<sequence>
16	<element ref="launchDatapoolCheckPass"/>
17	</sequence>
18	<attribute name="point" type="string" use="required">
19	<annotation>
20	<documentation>
21
22	</documentation>
23	</annotation>
24	</attribute>
25	<attribute name="id" type="string">
26	<annotation>
27	<documentation>
28
29	</documentation>
30	</annotation>
31	</attribute>
32	<attribute name="name" type="string">
33	<annotation>
34	<documentation>
35
36	</documentation>
37	<appInfo>
38	<meta.attribute translatable="true"/>
39	</appInfo>
40	</annotation>
41	</attribute>
42	</complexType>
43	</element>
44
45	<element name="launchDatapoolCheckPass">
46	<complexType>
47	<sequence>
48	<element ref="supportedTestType"/>
49	</sequence>
50	<attribute name="uiClass" type="string" use="required">
51	<annotation>
52	<documentation>
53
54	</documentation>
55	</annotation>
56	</attribute>
57	</complexType>
58	</element>
59
60	<element name="supportedTestType">
61	<complexType>
62	<attribute name="name" type="string" use="default" value="">
63	<annotation>
64	<documentation>
65
66	</documentation>
67	</annotation>
68	</attribute>
69	</complexType>
70	</element>
71
72	<annotation>
73	<appInfo>
74	<meta.section type="since"/>
75	</appInfo>
76	<documentation>
77	[4.5.]
78	</documentation>
79	</annotation>
80
81	<annotation>
82	<appInfo>
83	<meta.section type="examples"/>
84	</appInfo>
85	<documentation>
86	[ <element name="extension">
87	<complexType>
88	<sequence>
89	<element ref="launchDatapoolCheckPass"/>
90	</sequence>
91	<attribute name="point" type="string" use="required">
92	<annotation>
93	<documentation>
94
95	</documentation>
96	</annotation>
97	</attribute>
98	<attribute name="id" type="string">
99	<annotation>
100	<documentation>
101
102	</documentation>
103	</annotation>
104	</attribute>
105	<attribute name="name" type="string">
106	<annotation>
107	<documentation>
108
109	</documentation>
110	<appInfo>
111	<meta.attribute translatable="true"/>
112	</appInfo>
113	</annotation>
114	</attribute>
115	</complexType>
116	</element>
117	.]
118	</documentation>
119	</annotation>
120
121	<annotation>
122	<appInfo>
123	<meta.section type="apiInfo"/>
124	</appInfo>
125	<documentation>
126	[org.eclipse.hyades.test.core.launch.extensions.IPassInfoCollector .]
127	</documentation>
128	</annotation>
129
130	<annotation>
131	<appInfo>
132	<meta.section type="implementation"/>
133	</appInfo>
134	<documentation>
135	[Enter information about supplied implementation of this extension point.]
136	</documentation>
137	</annotation>
138
139
140	</schema>