You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/01/09 18:43:08 UTC
svn commit: r1229273 - in /openejb/trunk/openejb/osgi:
openejb-core-osgi/pom.xml openejb-feature/src/main/feature/feature.xml
openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
Author: rmannibucau
Date: Mon Jan 9 17:43:08 2012
New Revision: 1229273
URL: http://svn.apache.org/viewvc?rev=1229273&view=rev
Log:
fixing imports for openejb core osgi - still the starting order to fix
Modified:
openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml?rev=1229273&r1=1229272&r2=1229273&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml Mon Jan 9 17:43:08 2012
@@ -118,7 +118,6 @@
<properties>
<openejb.osgi.import.pkg>
- javassist.util.proxy,
javax.annotation;version="[1.1.0,2.0.0)",
javax.annotation.security;version="[1.1.0,2.0.0)",
javax.annotation.sql;version="[1.1.0,2.0.0)",
@@ -291,7 +290,6 @@
org.junit.runners;resolution:=optional,
org.junit.runners.model;resolution:=optional,
org.omg.CORBA,
- org.osgi.framework,
org.quartz;resolution:=optional,
org.quartz.impl;resolution:=optional,
org.quartz.spi;resolution:=optional,
@@ -299,10 +297,15 @@
org.w3c.dom,
org.w3c.dom.ls,
org.xml.sax,
- org.xml.sax.helpers
+ org.xml.sax.helpers,
+ org.osgi.service.packageadmin,
+ org.osgi.framework;version="[1.4,1.6)",
+ org.osgi.util.tracker;version="[1.4,1.6)",
+ javassist.util.proxy;version="[3.9,4)"
</openejb.osgi.import.pkg>
<openejb.osgi.export>
'=META-INF.org^.apache^.openejb',
+ org.apache.openejb;version=${openejb.osgi.export.version},
org.apache.openejb.api.internal;version=${openejb.osgi.export.version},
org.apache.openejb.assembler;version=${openejb.osgi.export.version},
org.apache.openejb.assembler.classic;version=${openejb.osgi.export.version},
@@ -362,7 +365,6 @@
org.apache.openejb.util.proxy;version=${openejb.osgi.export.version},
org.apache.openejb.util.reflection;version=${openejb.osgi.export.version},
org.apache.openejb.util.urlhandler;version=${openejb.osgi.export.version},
- org.apache.openejb;version=${openejb.osgi.export.version},
org.apache.openejb.core.osgi.*;version=${openejb.osgi.export.version}
</openejb.osgi.export>
<openejb.bundle.activator>org.apache.openejb.core.osgi.impl.Activator</openejb.bundle.activator>
Modified: openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml?rev=1229273&r1=1229272&r2=1229273&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-feature/src/main/feature/feature.xml Mon Jan 9 17:43:08 2012
@@ -71,7 +71,7 @@
<bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle>
</feature>
- <feature name="openejb-core-dep" version="${project.version}">
+ <feature name="openejb-core" version="${project.version}">
<feature version="${javaee-api.version}">javaee-api</feature>
<!-- that shoudn't be necessary as we already have a stax bundle in javaee-api,
@@ -109,17 +109,13 @@
<bundle>mvn:org.apache.openejb/openejb-javaagent/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-jee/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-loader/${project.version}</bundle>
- <bundle>mvn:org.apache.openejb/openejb-karaf-commands/${project.version}</bundle>
- </feature>
-
- <feature name="openejb-core" version="${project.version}">
- <feature version="${project.version}">openejb-core-dep</feature>
<bundle>mvn:org.apache.openejb/openejb-core-osgi/${project.version}</bundle>
+ <bundle>mvn:org.apache.openejb/openejb-karaf-commands/${project.version}</bundle>
</feature>
<feature name="openejb-server" version="${project.version}">
- <feature version="${project.version}">openejb-core-dep</feature>
+ <feature version="${project.version}">openejb-core</feature>
<bundle>mvn:org.apache.openejb/openejb-ejbd/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-server/${project.version}</bundle>
<bundle>mvn:org.apache.openejb/openejb-client/${project.version}</bundle>
Modified: openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java?rev=1229273&r1=1229272&r2=1229273&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java (original)
+++ openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java Mon Jan 9 17:43:08 2012
@@ -42,6 +42,7 @@ import static org.junit.Assert.assertTru
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE;
@RunWith(JUnit4TestRunner.class)
@@ -63,7 +64,8 @@ public class OSGiKarafStartupTest {
.karafVersion("2.2.4"),
felix()
- , vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
+ // to debug activate next line and create a remote debug configuration in your IDE
+ // , vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
);
}