Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-12-07 06:56:10 -0500
committerSteve Powell2010-12-07 06:56:10 -0500
commite41d5d02f4371da890ff12ee1a247d5b6a639210 (patch)
tree7a3426b46472a2f7a97abd751fb8dc3aa17aba78
parentc4f5403917cf956c7cdb4300c0ea22f84b07228a (diff)
downloadorg.eclipse.virgo.medic-e41d5d02f4371da890ff12ee1a247d5b6a639210.tar.gz
org.eclipse.virgo.medic-e41d5d02f4371da890ff12ee1a247d5b6a639210.tar.xz
org.eclipse.virgo.medic-e41d5d02f4371da890ff12ee1a247d5b6a639210.zip
Disable Bundlor for integrationtest project;
Remove template.mf; disable bundlor in build.xml; disable bundlor in eclipse project builders; revert MANIFEST in src/test/resources to previous version.
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.externalToolBuilders/com.springsource.server.ide.bundlor.core.builder.launch7
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.project7
-rw-r--r--org.eclipse.virgo.medic.integrationtest/build.xml3
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF20
-rw-r--r--org.eclipse.virgo.medic.integrationtest/template.mf20
5 files changed, 23 insertions, 34 deletions
diff --git a/org.eclipse.virgo.medic.integrationtest/.externalToolBuilders/com.springsource.server.ide.bundlor.core.builder.launch b/org.eclipse.virgo.medic.integrationtest/.externalToolBuilders/com.springsource.server.ide.bundlor.core.builder.launch
new file mode 100644
index 0000000..5e5d649
--- /dev/null
+++ b/org.eclipse.virgo.medic.integrationtest/.externalToolBuilders/com.springsource.server.ide.bundlor.core.builder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="com.springsource.server.ide.bundlor.core.builder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/org.eclipse.virgo.medic.integrationtest/.project b/org.eclipse.virgo.medic.integrationtest/.project
index 445d599..00eb941 100644
--- a/org.eclipse.virgo.medic.integrationtest/.project
+++ b/org.eclipse.virgo.medic.integrationtest/.project
@@ -21,8 +21,13 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>com.springsource.server.ide.bundlor.core.builder</name>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <triggers>full,incremental,</triggers>
<arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value>&lt;project&gt;/.externalToolBuilders/com.springsource.server.ide.bundlor.core.builder.launch</value>
+ </dictionary>
</arguments>
</buildCommand>
</buildSpec>
diff --git a/org.eclipse.virgo.medic.integrationtest/build.xml b/org.eclipse.virgo.medic.integrationtest/build.xml
index f22c9dd..3df23dc 100644
--- a/org.eclipse.virgo.medic.integrationtest/build.xml
+++ b/org.eclipse.virgo.medic.integrationtest/build.xml
@@ -3,6 +3,7 @@
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../build.versions"/>
+ <property name="disable.bundlor" value="true" />
<import file="${basedir}/../virgo-build/weaving/default.xml"/>
-
+
</project>
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF
index 171d95e..428fb2a 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF
@@ -4,18 +4,14 @@ Bundle-Name: Medic Logging Integration Tests
Bundle-SymbolicName: org.eclipse.virgo.medic.log.test
Import-Package: ch.qos.logback.classic.spi,
ch.qos.logback.core,
- org.aspectj.lang;version="[1.6.6,2)",
- org.aspectj.lang.reflect;version="[1.6.6,2)",
- org.aspectj.runtime.reflect;version="[1.6.6,2)",
- org.eclipse.virgo.medic.dump;version="[2.2.0,2.3)",
- org.eclipse.virgo.medic.eventlog;version="[2.2.0,2.3)",
org.eclipse.virgo.medic.log;version="[2.2.0,2.3)",
- org.eclipse.virgo.medic.log.appender;version=0,
- org.eclipse.virgo.test.framework;version=0,
- org.junit;version=0,
- org.junit.runner,
+ org.eclipse.virgo.medic.log.appender,
+ org.osgi.service.cm,
org.osgi.framework;version=0,
- org.osgi.service.cm;version=0,
- org.slf4j
+ org.slf4j,
+ org.junit,
+ org.eclipse.virgo.test.framework,
+ org.eclipse.virgo.medic.dump,
+ org.eclipse.virgo.medic.eventlog
Bundle-Version: 1.0.0
-Bundle-ManifestVersion: 2
+Bundle-ManifestVersion: 2 \ No newline at end of file
diff --git a/org.eclipse.virgo.medic.integrationtest/template.mf b/org.eclipse.virgo.medic.integrationtest/template.mf
deleted file mode 100644
index e0502ba..0000000
--- a/org.eclipse.virgo.medic.integrationtest/template.mf
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.virgo.medic.log.test
-Bundle-Name: Medic Logging Integration Tests
-Bundle-Version: 1.0.0
-Import-Template:
- org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=, +1)}"
-Import-Package:
- org.osgi.framework;version="0",
- org.osgi.service.cm;version="0",
- org.eclipse.virgo.medic.log.appender;version="0",
- org.junit;version="0",
- org.eclipse.virgo.test.framework;version="0",
- org.eclipse.virgo.medic.dump;version="0",
- org.eclipse.virgo.medic.eventlog;version="0"
-Excluded-Exports:
- *
-Excluded-Imports:
- ch.qos.logback.classic

Back to the top