Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfullbright2011-12-16 12:31:50 -0500
committerpfullbright2011-12-16 12:31:50 -0500
commit143dd15f08c623702b55279e0b6aed738d885ce7 (patch)
treed5d6cafe2167c90635fe97460f40223d8f72f6a8
parentb257df9bc56cbea390f8e0c8b0155b95f4edb470 (diff)
downloadwebtools.dali-143dd15f08c623702b55279e0b6aed738d885ce7.tar.gz
webtools.dali-143dd15f08c623702b55279e0b6aed738d885ce7.tar.xz
webtools.dali-143dd15f08c623702b55279e0b6aed738d885ce7.zip
changed system property for eclipselink.jar
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java10
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java8
-rw-r--r--jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java2
3 files changed, 10 insertions, 10 deletions
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java
index dcbafd3be5..1077b49b4b 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java
@@ -40,14 +40,14 @@ public class TestJaxbProject
// ***** static methods *****
public static final String JAXB_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.jaxb.jar";
- public static final String EL_JAXB_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.eljaxb.jar";
+ public static final String ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.eclipselink.jar";
public static String jaxbJarName() {
return getSystemProperty(JAXB_JAR_NAME_SYSTEM_PROPERTY);
}
- public static String elJaxbJarName() {
- return getSystemProperty(EL_JAXB_JAR_NAME_SYSTEM_PROPERTY);
+ public static String eclipselinkJarName() {
+ return getSystemProperty(ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY);
}
private static String getSystemProperty(String propertyName) {
@@ -80,8 +80,8 @@ public class TestJaxbProject
((IProjectFacetVersion) config.getProperty(IFacetDataModelProperties.FACET_VERSION)).getVersionString();
this.installFacet(JaxbFacet.ID, jaxbFacetVersion, config);
this.addJar(jaxbJarName());
- if (elJaxbJarName() != null) {
- this.addJar(elJaxbJarName());
+ if (eclipselinkJarName() != null) {
+ this.addJar(eclipselinkJarName());
}
this.jaxbProject = JptJaxbCorePlugin.getJaxbProject(this.getProject());
this.jaxbProject.setContextModelSynchronizer(this.buildSynchronousContextModelSynchronizer());
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java
index f43b6463de..1906a28948 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java
@@ -31,18 +31,18 @@ public class ELJaxbCoreTests {
}
public static boolean elJaxbJarPropertyExists() {
- return getSystemProperty(TestJaxbProject.EL_JAXB_JAR_NAME_SYSTEM_PROPERTY) != null;
+ return getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY) != null;
}
public static boolean elJaxbJarFileExists() {
- return (new File(getSystemProperty(TestJaxbProject.EL_JAXB_JAR_NAME_SYSTEM_PROPERTY))).exists();
+ return (new File(getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY))).exists();
}
public static String buildMissingJarErrorMessage() {
if( ! elJaxbJarPropertyExists()) {
- return errorMissingProperty(TestJaxbProject.EL_JAXB_JAR_NAME_SYSTEM_PROPERTY);
+ return errorMissingProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY);
}
- return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.EL_JAXB_JAR_NAME_SYSTEM_PROPERTY));
+ return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY));
}
/*********** private **********/
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java
index fd80fff0a0..479010c881 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java
@@ -27,7 +27,7 @@ public class ELJaxbJavaResourceModelTestCase
@Override
protected void setUp() throws Exception {
super.setUp();
- this.javaProject.addJar(TestJaxbProject.elJaxbJarName());
+ this.javaProject.addJar(TestJaxbProject.eclipselinkJarName());
}
@Override

Back to the top