Bug 401267 - [enterprise] Provide support for persistence provider provided by the application - fix manifest template and build.xml
diff --git a/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.xml b/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.xml
index ea150a1..9fb62b1 100755
--- a/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.xml
+++ b/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.xml
@@ -2,7 +2,6 @@
<project name="org.eclipse.virgo.web.enterprise.javax.persistence.extension">
<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
- <property name="disable.bundlor" value="true" />
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../build.versions"/>
<import file="${basedir}/../virgo-build/standard/default.xml"/>
diff --git a/org.eclipse.virgo.web.enterprise.javax.persistence.extension/template.mf b/org.eclipse.virgo.web.enterprise.javax.persistence.extension/template.mf
index 82fc2dd..72db06f 100755
--- a/org.eclipse.virgo.web.enterprise.javax.persistence.extension/template.mf
+++ b/org.eclipse.virgo.web.enterprise.javax.persistence.extension/template.mf
@@ -7,5 +7,7 @@
Fragment-Host: javax.persistence;bundle-version="[2.0.4, 2.1.0)"
Import-Template: org.osgi.framework;version="0"
Export-Template: org.eclipse.virgo.web.enterprise.javax.persistence.extension
-Excluded-Exports:
- *
+Excluded-Imports:
+ javax.persistence;version="0",
+ javax.persistence.spi;version="0",
+ org.eclipse.persistence.javax.persistence.osgi;version="0"
diff --git a/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.xml b/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.xml
index 4971b0e..838e4d0 100755
--- a/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.xml
+++ b/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.xml
@@ -2,7 +2,6 @@
<project name="org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer">
<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
- <property name="disable.bundlor" value="true" />
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../build.versions"/>
<import file="${basedir}/../virgo-build/standard/default.xml"/>
diff --git a/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.xml b/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.xml
index 125881e..b2a24a6 100755
--- a/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.xml
+++ b/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.xml
@@ -2,7 +2,6 @@
<project name="org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook">
<property name="findbugs.exclude.file" value="${basedir}/findbugs-exclude.xml"/>
- <property name="disable.bundlor" value="true" />
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../build.versions"/>
<import file="${basedir}/../virgo-build/standard/default.xml"/>
diff --git a/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/template.mf b/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/template.mf
index 2ea8c06..80aa7a4 100755
--- a/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/template.mf
+++ b/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/template.mf
@@ -4,12 +4,13 @@
Bundle-SymbolicName: org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook
Bundle-Version: ${version}
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Template: org.eclipse.osgi.baseadaptor;version="0",,
- org.eclipse.osgi.baseadaptor.bundlefile;version="0",,
- org.eclipse.osgi.baseadaptor.hooks;version="0",,
- org.eclipse.osgi.baseadaptor.loader;version="0",,
- org.eclipse.osgi.framework.adaptor;version="0",,
- org.eclipse.osgi.internal.baseadaptor;version="0",,
+Fragment-Host: system.bundle;extension:="framework"
+Import-Template: org.eclipse.osgi.baseadaptor;version="0",
+ org.eclipse.osgi.baseadaptor.bundlefile;version="0",
+ org.eclipse.osgi.baseadaptor.hooks;version="0",
+ org.eclipse.osgi.baseadaptor.loader;version="0",
+ org.eclipse.osgi.framework.adaptor;version="0",
+ org.eclipse.osgi.internal.baseadaptor;version="0",
org.osgi.framework;version="0"
Excluded-Exports:
*
