Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2015-01-29 12:39:26 +0000
committerMarkus Tiede2015-01-29 12:39:26 +0000
commit5ed5e9c520c9d19920512488b85464bf3a010e39 (patch)
treed8e999b09420a05635c897778861528d6e70b10c
parent6928d5b1453bbeac3e76938b9ed2f738a86ba67f (diff)
downloadorg.eclipse.jubula.core-5ed5e9c520c9d19920512488b85464bf3a010e39.tar.gz
org.eclipse.jubula.core-5ed5e9c520c9d19920512488b85464bf3a010e39.tar.xz
org.eclipse.jubula.core-5ed5e9c520c9d19920512488b85464bf3a010e39.zip
Sprint task - allow API consumption / usage as OSGi bundle - part 1
-rw-r--r--org.eclipse.jubula.examples.api.adder.rcp/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.examples.api.adder.rcp/build.properties3
-rw-r--r--org.eclipse.jubula.examples.api.adder.rcp/launch/SimpleAdder JUnit Test.launch16
-rw-r--r--org.eclipse.jubula.examples.api.configuration/target/api-non-OSGi.target (renamed from org.eclipse.jubula.examples.api.configuration/target/api.target)6
4 files changed, 26 insertions, 4 deletions
diff --git a/org.eclipse.jubula.examples.api.adder.rcp/META-INF/MANIFEST.MF b/org.eclipse.jubula.examples.api.adder.rcp/META-INF/MANIFEST.MF
index f2eb0d8ca..7ff8323f3 100644
--- a/org.eclipse.jubula.examples.api.adder.rcp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.examples.api.adder.rcp/META-INF/MANIFEST.MF
@@ -16,4 +16,7 @@ Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.jubula.toolkit.base.api;bundle-version="[3.0.0,3.1.0)",
org.eclipse.jubula.toolkit.concrete.api;bundle-version="[3.0.0,3.1.0)",
org.eclipse.jubula.toolkit.rcp.api;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.jubula.toolkit.swt.api;bundle-version="[3.0.0,3.1.0)"
+ org.eclipse.jubula.toolkit.swt.api;bundle-version="[3.0.0,3.1.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
+ org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
+ org.apache.commons.codec;bundle-version="[1.4.0,2.0.0)"
diff --git a/org.eclipse.jubula.examples.api.adder.rcp/build.properties b/org.eclipse.jubula.examples.api.adder.rcp/build.properties
index b1af29ec0..a1d2e476c 100644
--- a/org.eclipse.jubula.examples.api.adder.rcp/build.properties
+++ b/org.eclipse.jubula.examples.api.adder.rcp/build.properties
@@ -11,7 +11,8 @@ jars.compile.order = .
bin.includes = about.html,\
META-INF/,\
.,\
- resources/
+ resources/,\
+ plugin.properties
javacSource = 1.6
javacTarget = 1.6
javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.examples.api.adder.rcp/launch/SimpleAdder JUnit Test.launch b/org.eclipse.jubula.examples.api.adder.rcp/launch/SimpleAdder JUnit Test.launch
new file mode 100644
index 000000000..b5e63b084
--- /dev/null
+++ b/org.eclipse.jubula.examples.api.adder.rcp/launch/SimpleAdder JUnit Test.launch
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.jubula.examples.api.adder.rcp"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jubula.examples.api.adder.rcp"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jubula.examples.api.adder.rcp"/>
+</launchConfiguration>
diff --git a/org.eclipse.jubula.examples.api.configuration/target/api.target b/org.eclipse.jubula.examples.api.configuration/target/api-non-OSGi.target
index 305893c76..23866c98e 100644
--- a/org.eclipse.jubula.examples.api.configuration/target/api.target
+++ b/org.eclipse.jubula.examples.api.configuration/target/api-non-OSGi.target
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="api" sequenceNumber="0">
+<?pde version="3.8"?><target name="api-non-OSGi" sequenceNumber="1">
<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jubula.feature.api.core.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jubula.feature.api.core.source.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/jubula/development"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="1.1.0.v20140129-1625"/>
<unit id="org.junit" version="0.0.0"/>
+<unit id="org.hamcrest.core" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/luna"/>
</location>
</locations>

Back to the top