tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r832492 - in /openejb/trunk/openejb3: container/openejb-loader/pom.xml server/openejb-client/pom.xml
Date Tue, 03 Nov 2009 18:12:45 GMT
Author: rickmcguire
Date: Tue Nov  3 18:12:44 2009
New Revision: 832492

URL: http://svn.apache.org/viewvc?rev=832492&view=rev
Log:
Some changes to cleanup osgi package import issues

Modified:
    openejb/trunk/openejb3/container/openejb-loader/pom.xml
    openejb/trunk/openejb3/server/openejb-client/pom.xml

Modified: openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/pom.xml?rev=832492&r1=832491&r2=832492&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-loader/pom.xml Tue Nov  3 18:12:44 2009
@@ -1,20 +1,20 @@
 <!--
-    
+
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
         http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-    
+
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -34,6 +34,7 @@
       org.apache.catalina*;resolution:=optional,
       !sun.misc.*,
       org.apache.openejb.*,
+      javax.transaction*;version=1.1,
       *
     </openejb.osgi.import>
   </properties>
@@ -57,7 +58,7 @@
         <configuration>
           <instructions>
             <Require-Bundle>org.apache.openejb.core</Require-Bundle>
-            <Import-Package>org.apache.openejb,javax.transaction,*</Import-Package>
+            <Import-Package>org.apache.openejb,javax.transaction;version="1.1",*</Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: openejb/trunk/openejb3/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/pom.xml?rev=832492&r1=832491&r2=832492&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-client/pom.xml Tue Nov  3 18:12:44 2009
@@ -31,10 +31,10 @@
   <name>OpenEJB :: Server :: Client</name>
   <properties>
     <openejb.osgi.import.pkg>
-      *
+      javax.transaction;version="1.1",*
     </openejb.osgi.import.pkg>
     <openejb.osgi.require.bundle>
-      org.apache.openejb.openejb-core
+      org.apache.openejb.core
     </openejb.osgi.require.bundle>
   </properties>
   <build>
@@ -92,6 +92,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-core</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
       <artifactId>ejb31-api-experimental</artifactId>
       <version>${version}</version>
     </dependency>



Mime
View raw message