Attachment #230937 for bug #407889

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

View | Details | Raw Unified | Return to bug 407889
Collapse All | Expand All

Lines 59-68 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", Link Here

(-)a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF (-3 / +6 lines)
59	org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",	59	org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
60	org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",	60	org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
61	javax.persistence;bundle-version="[2.0.3,3.0.0)",	61	javax.persistence;bundle-version="[2.0.3,3.0.0)",
		62	org.eclipse.persistence.asm;bundle-version="[2.2.0,3.5.0)",
		63	org.eclipse.persistence.antlr;bundle-version="[2.2.0,3.5.0)",
62	org.eclipse.persistence.core;bundle-version="[2.2.0,3.0.0)",	64	org.eclipse.persistence.core;bundle-version="[2.2.0,3.0.0)",
63	org.eclipse.persistence.jpa;bundle-version="[2.2.0,3.0.0)",	65	org.eclipse.persistence.jpa;bundle-version="[2.2.0,3.0.0)",
64	org.eclipse.persistence.asm;bundle-version="[2.2.0,3.5.0)",	66	org.eclipse.persistence.jpa.jpql;bundle-version="[2.0.0,3.0.0)",
65	org.eclipse.jubula.persistence.jpa.osgi;bundle-version="[2.1.0,2.2.0)",	67	osgi.enterprise;bundle-version="[4.2.0,5.0.0)",
		68	org.eclipse.gemini.jpa;bundle-version="[1.0.0,2.0.0)",
66	org.slf4j.api;bundle-version="[1.5.11,2.0.0)",	69	org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
67	ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",	70	ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
68	ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",	71	ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
Lines 73-76 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", Link Here
73	Bundle-RequiredExecutionEnvironment: J2SE-1.5	76	Bundle-RequiredExecutionEnvironment: J2SE-1.5
74	Bundle-Activator: org.eclipse.jubula.client.core.Activator	77	Bundle-Activator: org.eclipse.jubula.client.core.Activator
75	Bundle-ActivationPolicy: lazy	78	Bundle-ActivationPolicy: lazy
76	JPA-PersistenceUnits: org.eclipse.jubula	79	Meta-Persistence: META-INF/persistence.xml





import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.objects.ComponentIdentifier;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.persistence.annotations.BatchFetch;
import org.eclipse.persistence.annotations.BatchFetchType;


 */
@Entity
@Table(name = "COMP_ID")
class CompIdentifierPO implements ICompIdentifierPO {
    ICompIdentifierPO {
    
    
    /** Persistence (JPA / EclipseLink) OID */
    private transient Long m_id = null;


    
    /** The ID of the parent project */
    private Long m_parentProjectId = null;
    
    /**
     * the sharable component identifier
     */
    private ComponentIdentifier m_componentIdentifier = 
            new ComponentIdentifier();

    /**
     * only for Persistence (JPA / EclipseLink)

    @JoinColumn(name = "FK_COMP_ID")
    @BatchFetch(value = BatchFetchType.JOIN)
    public List getNeighbours() { // NOPMD by al on 3/19/07 1:26 PM
        return m_componentIdentifier.getNeighbours();
    }

    /**
     * @param neighbours The neighbours to set.
     */
    public void setNeighbours(List neighbours) { // NOPMD by al on 3/19/07 1:26 PM
        m_componentIdentifier.setNeighbours(neighbours);
    }

    /**

    @Basic
    @Column(name = "COMP_CLASS_NAME", length = 4000)
    public String getComponentClassName() { // NOPMD by al on 3/19/07 1:26 PM
        return m_componentIdentifier.getComponentClassName();
    }
    
    /**
     * @param componentClassName The componentClassName to set.
     */
    public void setComponentClassName(String componentClassName) { // NOPMD by al on 3/19/07 1:26 PM
        m_componentIdentifier.setComponentClassName(componentClassName);
    }
    
    /**

    @Basic
    @Column(name = "SUPP_CLASS_NAME", length = 4000)
    public String getSupportedClassName() { // NOPMD by al on 3/19/07 1:26 PM
        return m_componentIdentifier.getSupportedClassName();
    }
    
    /**
     * @param supportedClassName The supportedClassName to set.
     */
    public void setSupportedClassName(String supportedClassName) { // NOPMD by al on 3/19/07 1:26 PM
        m_componentIdentifier.setSupportedClassName(supportedClassName);
    }
    
    /**

    @JoinColumn(name = "FK_COMP_ID")
    @BatchFetch(value = BatchFetchType.JOIN)
    public List<String> getHierarchyNames() { // NOPMD by al on 3/19/07 1:26 PM
        return m_componentIdentifier.getHierarchyNames();
    }
    
    /**

     *            The hierarchyNames to set. if null, the list will be cleared.
     */
    public void setHierarchyNames(List hierarchyNames) { // NOPMD by al on 3/19/07 1:26 PM
        m_componentIdentifier.setHierarchyNames(hierarchyNames);
    }
    
    /**

        return StringConstants.EMPTY;
    }

    /** {@inheritDoc} */
     *    
     * {@inheritDoc}
     */
    @Basic
    @Column(name = "ALTERNATIVE_DISPLAY_NAME", length = 4000)
    public String getAlternativeDisplayName() {
        return m_componentIdentifier.getAlternativeDisplayName();
    }

    /**
     * {@inheritDoc}
     */
    public void setAlternativeDisplayName(String alternativeDisplayName) {
        m_componentIdentifier.setAlternativeDisplayName(alternativeDisplayName);
    }

    /** {@inheritDoc} */
    public String getComponentName() {
        return m_componentIdentifier.getComponentName();
    }

    /** {@inheritDoc} */
    public void addHierarchyName(String hierarchyNames) {
        m_componentIdentifier.addHierarchyName(hierarchyNames);
    }

    /** {@inheritDoc} */
    public void clearHierarchyNames() {
        m_componentIdentifier.clearHierarchyNames();
    }

    /** {@inheritDoc} */
    public IComponentIdentifier makeClone() {
        return m_componentIdentifier.makeClone();
    }

    /** {@inheritDoc} */
    public void addNeighbour(String neighbours) {
        m_componentIdentifier.addNeighbour(neighbours);
    }

    /** {@inheritDoc} */
    public String generateLogicalName() {
        return m_componentIdentifier.generateLogicalName();
    }

    /** {@inheritDoc} */
    public String getComponentNameToDisplay() {
        return m_componentIdentifier.getComponentNameToDisplay();
    }

    /** {@inheritDoc} */
    public void setMatchPercentage(double matchPercentage) {
        m_componentIdentifier.setMatchPercentage(matchPercentage);        
    }

    /** {@inheritDoc} */
    public double getMatchPercentage() {
        return m_componentIdentifier.getMatchPercentage();
    }

    /** {@inheritDoc} */
    public void setNumberOfOtherMatchingComponents(
            int numberOfOtherMatchingComponents) {
        m_componentIdentifier.setNumberOfOtherMatchingComponents(
                numberOfOtherMatchingComponents);
    }

    /** {@inheritDoc} */
    public int getNumberOfOtherMatchingComponents() {
        return m_componentIdentifier.getNumberOfOtherMatchingComponents();
    }

    /** {@inheritDoc} */
    public boolean isEqualOriginalFound() {
        return m_componentIdentifier.isEqualOriginalFound();
    }
    
    /** {@inheritDoc} */
    public void setEqualOriginalFound(boolean equalOriginalFound) {
        m_componentIdentifier.setEqualOriginalFound(equalOriginalFound);
    }
}

Lines 22-32 import org.eclipse.jubula.tools.objects.MonitoringValue; Link Here

(-)a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java (-17 / +19 lines)
22	* @created 20.08.2010	22	* @created 20.08.2010
23	*/	23	*/
24	@Embeddable	24	@Embeddable
25	public class MonitoringValuePO extends MonitoringValue {	25	public class MonitoringValuePO {
26		26	/**
		27	* the monitoring value
		28	*/
		29	private MonitoringValue m_monitoringValue;
		30
27	/** default */	31	/** default */
28	public MonitoringValuePO() {	32	public MonitoringValuePO() {
29	super();	33	m_monitoringValue = new MonitoringValue();
30	}	34	}
31		35
32	/**	36	/**
Lines 34-41 public class MonitoringValuePO extends MonitoringValue { Link Here
34	* @param type the type to set	38	* @param type the type to set
35	*/	39	*/
36	public MonitoringValuePO(String value, String type) {	40	public MonitoringValuePO(String value, String type) {
37	super(value, type);	41	m_monitoringValue = new MonitoringValue(value, type);
38
39	}	42	}
40		43
41	/**	44	/**
Lines 47-54 public class MonitoringValuePO extends MonitoringValue { Link Here
47	*	50	*
48	*/	51	*/
49	public MonitoringValuePO(String value, String type, String category) {	52	public MonitoringValuePO(String value, String type, String category) {
50	super(value, type, category);	53	m_monitoringValue = new MonitoringValue(value, type, category);
51
52	}	54	}
53		55
54	/**	56	/**
Lines 63-70 public class MonitoringValuePO extends MonitoringValue { Link Here
63	*/	65	*/
64	public MonitoringValuePO(String value, String type, String category,	66	public MonitoringValuePO(String value, String type, String category,
65	boolean isSignificant) {	67	boolean isSignificant) {
66	super(value, type, category, isSignificant);	68	m_monitoringValue = new MonitoringValue(value, type, category,
67		69	isSignificant);
68	}	70	}
69		71
70	/**	72	/**
Lines 73-79 public class MonitoringValuePO extends MonitoringValue { Link Here
73	@Basic	75	@Basic
74	@Column(name = "MON_VALUE")	76	@Column(name = "MON_VALUE")
75	public String getValue() {	77	public String getValue() {
76	return super.getValue();	78	return m_monitoringValue.getValue();
77	}	79	}
78		80
79	/**	81	/**
Lines 82-88 public class MonitoringValuePO extends MonitoringValue { Link Here
82	@Basic	84	@Basic
83	@Column(name = "MON_TYPE")	85	@Column(name = "MON_TYPE")
84	public String getType() {	86	public String getType() {
85	return super.getType();	87	return m_monitoringValue.getType();
86	}	88	}
87		89
88	/**	90	/**
Lines 91-125 public class MonitoringValuePO extends MonitoringValue { Link Here
91	@Basic	93	@Basic
92	@Column(name = "MON_CATEGORY")	94	@Column(name = "MON_CATEGORY")
93	public String getCategory() {	95	public String getCategory() {
94	return super.getCategory();	96	return m_monitoringValue.getCategory();
95	}	97	}
96		98
97	/**	99	/**
98	* {@inheritDoc}	100	* {@inheritDoc}
99	*/	101	*/
100	public void setCategory(String category) {	102	public void setCategory(String category) {
101	super.setCategory(category);	103	m_monitoringValue.setCategory(category);
102	}	104	}
103		105
104	/**	106	/**
105	* @param value the value to set	107	* @param value the value to set
106	*/	108	*/
107	public void setValue(String value) {	109	public void setValue(String value) {
108	super.setValue(value);	110	m_monitoringValue.setValue(value);
109	}	111	}
110		112
111	/**	113	/**
112	* @param type the type to set	114	* @param type the type to set
113	*/	115	*/
114	public void setType(String type) {	116	public void setType(String type) {
115	super.setType(type);	117	m_monitoringValue.setType(type);
116	}	118	}
117		119
118	/**	120	/**
119	* {@inheritDoc}	121	* {@inheritDoc}
120	*/	122	*/
121	public void setSignificant(Boolean significant) {	123	public void setSignificant(Boolean significant) {
122	super.setSignificant(significant);	124	m_monitoringValue.setSignificant(significant);
123		125
124	}	126	}
125		127
Lines 129-135 public class MonitoringValuePO extends MonitoringValue { Link Here
129	@Basic	131	@Basic
130	@Column(name = "IS_SIGNIFICANT")	132	@Column(name = "IS_SIGNIFICANT")
131	public Boolean isSignificant() {	133	public Boolean isSignificant() {
132	return super.isSignificant();	134	return m_monitoringValue.isSignificant();
133		135
134	}	136	}
135		137




import org.eclipse.osgi.util.NLS;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.exceptions.DatabaseException;
import org.eclipse.persistence.jpa.osgi.PersistenceProvider;
import org.eclipse.persistence.sessions.server.ServerSession;
import org.eclipse.persistence.tools.schemaframework.SchemaManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.service.jpa.EntityManagerFactoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


            properties.put(PersistenceUnitProperties.BATCH_WRITING_SIZE,
                    batchWritingSize);
        }
        return getEMF(DEFAULT_PU_NAME, properties);
    }
    
    /**
     * @param unitName
     *            the persistence units name
     * @param props
     *            the properties to use
     * @return an entity manager factory
     */
    public static EntityManagerFactory getEMF(String unitName,
            Map<String, Object> props) {
        ServiceReference[] refs = null;
        EntityManagerFactoryBuilder emfb = null;
        BundleContext context = Activator.getDefault().getBundle()
                .getBundleContext();
        try {
            refs = context.getServiceReferences(
                    EntityManagerFactoryBuilder.class.getName(),
                    "(osgi.unit.name=" + unitName + ")");
        } catch (InvalidSyntaxException isEx) {
            throw new RuntimeException("Filter error", isEx);
        }
        if (refs != null) {
            emfb = (EntityManagerFactoryBuilder) context.getService(refs[0]); 
        }
        return (emfb == null) ? null : emfb.createEntityManagerFactory(props);
    }
    
    /**




<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gemini.jpa" version="0.0.0"/>
<unit id="osgi.enterprise" version="0.0.0"/>
<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
<unit id="javax.xml" version="0.0.0"/>
<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
<repository id="eclipse-juno" location="http://download.eclipse.org/releases/juno"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/rt/eclipselink/milestone-updates/2.5.0.v20130425-368d603_RC1"/>
</location>
</locations>
</target>

Return to bug 407889

Lines 29-34 import javax.persistence.Version; Link Here

(-)a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java (-18 / +85 lines)
29		29
30	import org.eclipse.jubula.tools.constants.StringConstants;	30	import org.eclipse.jubula.tools.constants.StringConstants;
31	import org.eclipse.jubula.tools.objects.ComponentIdentifier;	31	import org.eclipse.jubula.tools.objects.ComponentIdentifier;
		32	import org.eclipse.jubula.tools.objects.IComponentIdentifier;
32	import org.eclipse.persistence.annotations.BatchFetch;	33	import org.eclipse.persistence.annotations.BatchFetch;
33	import org.eclipse.persistence.annotations.BatchFetchType;	34	import org.eclipse.persistence.annotations.BatchFetchType;
34		35
Lines 38-47 import org.eclipse.persistence.annotations.BatchFetchType; Link Here
38	*/	39	*/
39	@Entity	40	@Entity
40	@Table(name = "COMP_ID")	41	@Table(name = "COMP_ID")
41	class CompIdentifierPO extends ComponentIdentifier implements	42	class CompIdentifierPO implements ICompIdentifierPO {
42	ICompIdentifierPO {
43
44
45	/** Persistence (JPA / EclipseLink) OID */	43	/** Persistence (JPA / EclipseLink) OID */
46	private transient Long m_id = null;	44	private transient Long m_id = null;
47		45
Lines 50-55 class CompIdentifierPO extends ComponentIdentifier implements Link Here
50		48
51	/** The ID of the parent project */	49	/** The ID of the parent project */
52	private Long m_parentProjectId = null;	50	private Long m_parentProjectId = null;
		51
		52	/**
		53	* the sharable component identifier
		54	*/
		55	private ComponentIdentifier m_componentIdentifier =
		56	new ComponentIdentifier();
53		57
54	/**	58	/**
55	* only for Persistence (JPA / EclipseLink)	59	* only for Persistence (JPA / EclipseLink)
Lines 69-82 class CompIdentifierPO extends ComponentIdentifier implements Link Here
69	@JoinColumn(name = "FK_COMP_ID")	73	@JoinColumn(name = "FK_COMP_ID")
70	@BatchFetch(value = BatchFetchType.JOIN)	74	@BatchFetch(value = BatchFetchType.JOIN)
71	public List getNeighbours() { // NOPMD by al on 3/19/07 1:26 PM	75	public List getNeighbours() { // NOPMD by al on 3/19/07 1:26 PM
72	return super.getNeighbours();	76	return m_componentIdentifier.getNeighbours();
73	}	77	}
74		78
75	/**	79	/**
76	* @param neighbours The neighbours to set.	80	* @param neighbours The neighbours to set.
77	*/	81	*/
78	public void setNeighbours(List neighbours) { // NOPMD by al on 3/19/07 1:26 PM	82	public void setNeighbours(List neighbours) { // NOPMD by al on 3/19/07 1:26 PM
79	super.setNeighbours(neighbours);	83	m_componentIdentifier.setNeighbours(neighbours);
80	}	84	}
81		85
82	/**	86	/**
Lines 86-99 class CompIdentifierPO extends ComponentIdentifier implements Link Here
86	@Basic	90	@Basic
87	@Column(name = "COMP_CLASS_NAME", length = 4000)	91	@Column(name = "COMP_CLASS_NAME", length = 4000)
88	public String getComponentClassName() { // NOPMD by al on 3/19/07 1:26 PM	92	public String getComponentClassName() { // NOPMD by al on 3/19/07 1:26 PM
89	return super.getComponentClassName();	93	return m_componentIdentifier.getComponentClassName();
90	}	94	}
91		95
92	/**	96	/**
93	* @param componentClassName The componentClassName to set.	97	* @param componentClassName The componentClassName to set.
94	*/	98	*/
95	public void setComponentClassName(String componentClassName) { // NOPMD by al on 3/19/07 1:26 PM	99	public void setComponentClassName(String componentClassName) { // NOPMD by al on 3/19/07 1:26 PM
96	super.setComponentClassName(componentClassName);	100	m_componentIdentifier.setComponentClassName(componentClassName);
97	}	101	}
98		102
99	/**	103	/**
Lines 103-116 class CompIdentifierPO extends ComponentIdentifier implements Link Here
103	@Basic	107	@Basic
104	@Column(name = "SUPP_CLASS_NAME", length = 4000)	108	@Column(name = "SUPP_CLASS_NAME", length = 4000)
105	public String getSupportedClassName() { // NOPMD by al on 3/19/07 1:26 PM	109	public String getSupportedClassName() { // NOPMD by al on 3/19/07 1:26 PM
106	return super.getSupportedClassName();	110	return m_componentIdentifier.getSupportedClassName();
107	}	111	}
108		112
109	/**	113	/**
110	* @param supportedClassName The supportedClassName to set.	114	* @param supportedClassName The supportedClassName to set.
111	*/	115	*/
112	public void setSupportedClassName(String supportedClassName) { // NOPMD by al on 3/19/07 1:26 PM	116	public void setSupportedClassName(String supportedClassName) { // NOPMD by al on 3/19/07 1:26 PM
113	super.setSupportedClassName(supportedClassName);	117	m_componentIdentifier.setSupportedClassName(supportedClassName);
114	}	118	}
115		119
116	/**	120	/**
Lines 124-130 class CompIdentifierPO extends ComponentIdentifier implements Link Here
124	@JoinColumn(name = "FK_COMP_ID")	128	@JoinColumn(name = "FK_COMP_ID")
125	@BatchFetch(value = BatchFetchType.JOIN)	129	@BatchFetch(value = BatchFetchType.JOIN)
126	public List<String> getHierarchyNames() { // NOPMD by al on 3/19/07 1:26 PM	130	public List<String> getHierarchyNames() { // NOPMD by al on 3/19/07 1:26 PM
127	return super.getHierarchyNames();	131	return m_componentIdentifier.getHierarchyNames();
128	}	132	}
129		133
130	/**	134	/**
Lines 132-138 class CompIdentifierPO extends ComponentIdentifier implements Link Here
132	* The hierarchyNames to set. if null, the list will be cleared.	136	* The hierarchyNames to set. if null, the list will be cleared.
133	*/	137	*/
134	public void setHierarchyNames(List hierarchyNames) { // NOPMD by al on 3/19/07 1:26 PM	138	public void setHierarchyNames(List hierarchyNames) { // NOPMD by al on 3/19/07 1:26 PM
135	super.setHierarchyNames(hierarchyNames);	139	m_componentIdentifier.setHierarchyNames(hierarchyNames);
136	}	140	}
137		141
138	/**	142	/**
Lines 236-256 class CompIdentifierPO extends ComponentIdentifier implements Link Here
236	return StringConstants.EMPTY;	240	return StringConstants.EMPTY;
237	}	241	}
238		242
239	/**	243	/** {@inheritDoc} */
240	*
241	* {@inheritDoc}
242	*/
243	@Basic	244	@Basic
244	@Column(name = "ALTERNATIVE_DISPLAY_NAME", length = 4000)	245	@Column(name = "ALTERNATIVE_DISPLAY_NAME", length = 4000)
245	public String getAlternativeDisplayName() {	246	public String getAlternativeDisplayName() {
246	return super.getAlternativeDisplayName();	247	return m_componentIdentifier.getAlternativeDisplayName();
247	}	248	}
248		249
249	/**	250	/**
250	* {@inheritDoc}	251	* {@inheritDoc}
251	*/	252	*/
252	public void setAlternativeDisplayName(String alternativeDisplayName) {	253	public void setAlternativeDisplayName(String alternativeDisplayName) {
253	super.setAlternativeDisplayName(alternativeDisplayName);	254	m_componentIdentifier.setAlternativeDisplayName(alternativeDisplayName);
		255	}
		256
		257	/** {@inheritDoc} */
		258	public String getComponentName() {
		259	return m_componentIdentifier.getComponentName();
		260	}
		261
		262	/** {@inheritDoc} */
		263	public void addHierarchyName(String hierarchyNames) {
		264	m_componentIdentifier.addHierarchyName(hierarchyNames);
		265	}
		266
		267	/** {@inheritDoc} */
		268	public void clearHierarchyNames() {
		269	m_componentIdentifier.clearHierarchyNames();
		270	}
		271
		272	/** {@inheritDoc} */
		273	public IComponentIdentifier makeClone() {
		274	return m_componentIdentifier.makeClone();
254	}	275	}
255		276
		277	/** {@inheritDoc} */
		278	public void addNeighbour(String neighbours) {
		279	m_componentIdentifier.addNeighbour(neighbours);
		280	}
		281
		282	/** {@inheritDoc} */
		283	public String generateLogicalName() {
		284	return m_componentIdentifier.generateLogicalName();
		285	}
		286
		287	/** {@inheritDoc} */
		288	public String getComponentNameToDisplay() {
		289	return m_componentIdentifier.getComponentNameToDisplay();
		290	}
		291
		292	/** {@inheritDoc} */
		293	public void setMatchPercentage(double matchPercentage) {
		294	m_componentIdentifier.setMatchPercentage(matchPercentage);
		295	}
		296
		297	/** {@inheritDoc} */
		298	public double getMatchPercentage() {
		299	return m_componentIdentifier.getMatchPercentage();
		300	}
		301
		302	/** {@inheritDoc} */
		303	public void setNumberOfOtherMatchingComponents(
		304	int numberOfOtherMatchingComponents) {
		305	m_componentIdentifier.setNumberOfOtherMatchingComponents(
		306	numberOfOtherMatchingComponents);
		307	}
		308
		309	/** {@inheritDoc} */
		310	public int getNumberOfOtherMatchingComponents() {
		311	return m_componentIdentifier.getNumberOfOtherMatchingComponents();
		312	}
		313
		314	/** {@inheritDoc} */
		315	public boolean isEqualOriginalFound() {
		316	return m_componentIdentifier.isEqualOriginalFound();
		317	}
		318
		319	/** {@inheritDoc} */
		320	public void setEqualOriginalFound(boolean equalOriginalFound) {
		321	m_componentIdentifier.setEqualOriginalFound(equalOriginalFound);
		322	}
256	}	323	}

Lines 64-72 import org.eclipse.jubula.tools.messagehandling.MessageIDs; Link Here

(-)a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java (-4 / +31 lines)
64	import org.eclipse.osgi.util.NLS;	64	import org.eclipse.osgi.util.NLS;
65	import org.eclipse.persistence.config.PersistenceUnitProperties;	65	import org.eclipse.persistence.config.PersistenceUnitProperties;
66	import org.eclipse.persistence.exceptions.DatabaseException;	66	import org.eclipse.persistence.exceptions.DatabaseException;
67	import org.eclipse.persistence.jpa.osgi.PersistenceProvider;
68	import org.eclipse.persistence.sessions.server.ServerSession;	67	import org.eclipse.persistence.sessions.server.ServerSession;
69	import org.eclipse.persistence.tools.schemaframework.SchemaManager;	68	import org.eclipse.persistence.tools.schemaframework.SchemaManager;
		69	import org.osgi.framework.BundleContext;
		70	import org.osgi.framework.InvalidSyntaxException;
		71	import org.osgi.framework.ServiceReference;
		72	import org.osgi.service.jpa.EntityManagerFactoryBuilder;
70	import org.slf4j.Logger;	73	import org.slf4j.Logger;
71	import org.slf4j.LoggerFactory;	74	import org.slf4j.LoggerFactory;
72		75
Lines 1182-1190 public class Persistor { Link Here
1182	properties.put(PersistenceUnitProperties.BATCH_WRITING_SIZE,	1185	properties.put(PersistenceUnitProperties.BATCH_WRITING_SIZE,
1183	batchWritingSize);	1186	batchWritingSize);
1184	}	1187	}
1185	return new PersistenceProvider().createEntityManagerFactory(	1188	return getEMF(DEFAULT_PU_NAME, properties);
1186	DEFAULT_PU_NAME,	1189	}
1187	properties);	1190
		1191	/**
		1192	* @param unitName
		1193	* the persistence units name
		1194	* @param props
		1195	* the properties to use
		1196	* @return an entity manager factory
		1197	*/
		1198	public static EntityManagerFactory getEMF(String unitName,
		1199	Map<String, Object> props) {
		1200	ServiceReference[] refs = null;
		1201	EntityManagerFactoryBuilder emfb = null;
		1202	BundleContext context = Activator.getDefault().getBundle()
		1203	.getBundleContext();
		1204	try {
		1205	refs = context.getServiceReferences(
		1206	EntityManagerFactoryBuilder.class.getName(),
		1207	"(osgi.unit.name=" + unitName + ")");
		1208	} catch (InvalidSyntaxException isEx) {
		1209	throw new RuntimeException("Filter error", isEx);
		1210	}
		1211	if (refs != null) {
		1212	emfb = (EntityManagerFactoryBuilder) context.getService(refs[0]);
		1213	}
		1214	return (emfb == null) ? null : emfb.createEntityManagerFactory(props);
1188	}	1215	}
1189		1216
1190	/**	1217	/**

Lines 23-36 Link Here

(-)a/org.eclipse.jubula.project.configuration/target/definitions/juno.target (-4 / +3 lines)
23	<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>	23	<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
24	<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>	24	<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
25	<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>	25	<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
		26	<unit id="org.eclipse.gemini.jpa" version="0.0.0"/>
		27	<unit id="osgi.enterprise" version="0.0.0"/>
		28	<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
26	<unit id="javax.xml" version="0.0.0"/>	29	<unit id="javax.xml" version="0.0.0"/>
27	<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>	30	<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
28	<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>	31	<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
29	<repository id="eclipse-juno" location="http://download.eclipse.org/releases/juno"/>	32	<repository id="eclipse-juno" location="http://download.eclipse.org/releases/juno"/>
30	</location>	33	</location>
31	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
32	<unit id="org.eclipse.persistence.jpa.feature.group" version="0.0.0"/>
33	<repository location="http://download.eclipse.org/rt/eclipselink/milestone-updates/2.5.0.v20130425-368d603_RC1"/>
34	</location>
35	</locations>	34	</locations>
36	</target>	35	</target>