You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by io...@apache.org on 2012/02/17 01:40:02 UTC
svn commit: r1245272 - in /incubator/directmemory/trunk: itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java platforms/karaf/src/main/resources/features.xml serializers/protostuff/pom.xml

Author: iocanel
Date: Fri Feb 17 00:40:02 2012
New Revision: 1245272

URL: http://svn.apache.org/viewvc?rev=1245272&view=rev
Log:
Updated package imports for dm-cache, removed references to josql from feature and tests.

Modified:
    incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java
    incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml
    incubator/directmemory/trunk/serializers/protostuff/pom.xml

Modified: incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java?rev=1245272&r1=1245271&r2=1245272&view=diff
==============================================================================
--- incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java (original)
+++ incubator/directmemory/trunk/itests/osgi/src/test/java/org/apache/directmemory/tests/osgi/DirectMemoryOsgiTestSupport.java Fri Feb 17 00:40:02 2012
@@ -170,8 +170,6 @@ public class DirectMemoryOsgiTestSupport
             mavenBundle().groupId( "org.apache.servicemix.bundles" ).artifactId(
                 "org.apache.servicemix.bundles.oro" ).version( "2.0.8_5" ),
             mavenBundle().groupId( "org.apache.servicemix.bundles" ).artifactId(
-                "org.apache.servicemix.bundles.josql" ).version( "1.5_5" ),
-            mavenBundle().groupId( "org.apache.servicemix.bundles" ).artifactId(
                 "org.apache.servicemix.bundles.aspectj" ).version( "1.6.8_2" ),
             mavenBundle().groupId( "com.dyuproject.protostuff" ).artifactId( "protostuff-uberjar" ).version( "1.0.2" ),
             mavenBundle().groupId( "org.apache.directmemory" ).artifactId( "directmemory-cache" ).version(

Modified: incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml?rev=1245272&r1=1245271&r2=1245272&view=diff
==============================================================================
--- incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml (original)
+++ incubator/directmemory/trunk/platforms/karaf/src/main/resources/features.xml Fri Feb 17 00:40:02 2012
@@ -30,9 +30,6 @@
       mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}
     </bundle>
     <bundle dependency='true'>
-      mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql.bundle.version}
-    </bundle>
-    <bundle dependency='true'>
       mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}
     </bundle>
     <bundle dependency='true'>mvn:com.dyuproject.protostuff/protostuff-uberjar/${protostuff.version}</bundle>

Modified: incubator/directmemory/trunk/serializers/protostuff/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/pom.xml?rev=1245272&r1=1245271&r2=1245272&view=diff
==============================================================================
--- incubator/directmemory/trunk/serializers/protostuff/pom.xml (original)
+++ incubator/directmemory/trunk/serializers/protostuff/pom.xml Fri Feb 17 00:40:02 2012
@@ -39,6 +39,9 @@ under the License.
     <osgi.import>
       !org.apache.directmemory*,
       com.dyuproject.protostuff*;version="[${protostuff.version})",
+      com.google.common*;version="${guava.version}",
+      org.aspectj*;version="${aspectj.version}",
+      org.slf4j*;version="${slf4j.version}"
     </osgi.import>
     <osgi.export>org.apache.directmemory*;version="${project.version}</osgi.export>
   </properties>