You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/06/20 15:22:21 UTC

svn commit: r1137625 - in /servicemix/smx4/bundles/trunk: ./ casbah-2.1.2/ casbah-2.1.2/src/ casbah-2.1.2/src/main/ casbah-2.1.2/src/main/resources/ casbah-2.1.2/src/main/resources/OSGI-INF/ scalaj-collection-1.0/ scalaj-collection-1.0/src/ scalaj-coll...

Author: gertv
Date: Mon Jun 20 13:22:20 2011
New Revision: 1137625

URL: http://svn.apache.org/viewvc?rev=1137625&view=rev
Log:
SMX4-854/SMX4-865: Add bundles for cashbah and scalaj-collection
 Thanks to Joris Schoolmeesters for the patches!

Added:
    servicemix/smx4/bundles/trunk/casbah-2.1.2/
    servicemix/smx4/bundles/trunk/casbah-2.1.2/pom.xml
    servicemix/smx4/bundles/trunk/casbah-2.1.2/src/
    servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/
    servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/resources/
    servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/resources/OSGI-INF/bundle.info
    servicemix/smx4/bundles/trunk/scalaj-collection-1.0/
    servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml
    servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/
    servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/
    servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/resources/
    servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/resources/OSGI-INF/bundle.info
Modified:
    servicemix/smx4/bundles/trunk/.gitignore
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/.gitignore?rev=1137625&r1=1137624&r2=1137625&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/.gitignore (original)
+++ servicemix/smx4/bundles/trunk/.gitignore Mon Jun 20 13:22:20 2011
@@ -2,3 +2,4 @@
 target
 .project
 .classpath
+.DS_Store
\ No newline at end of file

Added: servicemix/smx4/bundles/trunk/casbah-2.1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/casbah-2.1.2/pom.xml?rev=1137625&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/casbah-2.1.2/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/casbah-2.1.2/pom.xml Mon Jun 20 13:22:20 2011
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+
+        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.
+    -->
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>bundles-pom</artifactId>
+        <version>6</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+    
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.casbah</artifactId>
+    <packaging>bundle</packaging>
+    <version>2.1.2_1-SNAPSHOT</version>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+    <description>This OSGi bundle wraps casbah ${pkgVersion} jar files.</description>
+    
+    <properties>
+        <pkgGroupId>com.mongodb.casbah</pkgGroupId>
+        <pkgArtifactId>casbah_2.8.1</pkgArtifactId>
+        <pkgVersion>2.1.2</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            com.mongodb.casbah*
+        </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            !com.mongodb.casbah*,*	
+        </servicemix.osgi.import.pkg>
+    </properties>
+    
+	<repositories>
+        <repository>
+            <id>releases.scala-tools.org</id>
+            <url>http://scala-tools.org/repo-releases</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>casbah-commons_2.8.1</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>casbah-core_2.8.1</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>casbah-gridfs_2.8.1</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>casbah-query_2.8.1</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:casbah-commons_2.8.1</include>
+                                    <include>${pkgGroupId}:casbah-core_2.8.1</include>
+                                    <include>${pkgGroupId}:casbah-gridfs_2.8.1</include>
+                                    <include>${pkgGroupId}:casbah-query_2.8.1</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:casbah-commons_2.8.1</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:casbah-core_2.8.1</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:casbah-gridfs_2.8.1</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>${pkgGroupId}:casbah-query_2.8.1</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>                            
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

Added: servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/resources/OSGI-INF/bundle.info?rev=1137625&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/resources/OSGI-INF/bundle.info (added)
+++ servicemix/smx4/bundles/trunk/casbah-2.1.2/src/main/resources/OSGI-INF/bundle.info Mon Jun 20 13:22:20 2011
@@ -0,0 +1,8 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Casbah is a Scala toolkit for MongoDB---We use the term "toolkit" rather than "driver", as Casbah integrates a layer on top of the official mongo-java-driver for better integration with Scala.  This is as opposed to a native implementation of the MongoDB wire protocol, which the Java driver does exceptionally well. Rather than a complete rewrite, Casbah uses implicits, and `Pimp My Library` code to enhance the existing Java code.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://api.mongodb.org/scala/casbah/current/\u001B[0m

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1137625&r1=1137624&r2=1137625&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Mon Jun 20 13:22:20 2011
@@ -41,14 +41,10 @@
     <name>Apache ServiceMix :: Bundles</name>
 
     <modules>
-        <!--
-        <module>juel-2.1.0</module>
-        <module>juel-2.1.2</module>
-        <module>wss4j-1.5.4</module>
-        -->
-
+        <module>casbah-2.1.2</module>
         <module>java-apns-0.1.6</module>
         <module>quartz-2.0.1</module>
-     </modules>
+        <module>scalaj-collection-1.0</module>
+    </modules>
 
 </project>

Added: servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml?rev=1137625&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml (added)
+++ servicemix/smx4/bundles/trunk/scalaj-collection-1.0/pom.xml Mon Jun 20 13:22:20 2011
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+
+        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.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>bundles-pom</artifactId>
+        <version>6</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.scalaj-collection</artifactId>
+    <packaging>bundle</packaging>
+    <version>1.0_1-SNAPSHOT</version>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+    <description>This OSGi bundle wraps scalaj-collection ${pkgVersion} jar files.</description>
+
+    <properties>
+        <pkgGroupId>org.scalaj</pkgGroupId>
+        <pkgArtifactId>scalaj-collection_2.8.0</pkgArtifactId>
+        <pkgVersion>1.0</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            scalaj.collection;-noimport:=true
+        </servicemix.osgi.export.pkg>
+    </properties>
+
+	<repositories>
+        <repository>
+            <id>releases.scala-tools.org</id>
+            <url>http://scala-tools.org/repo-releases</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+               <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pkgGroupId}</groupId>
+            <artifactId>scalaj-collection_2.8.0</artifactId>
+            <version>${pkgVersion}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${pkgGroupId}:scalaj-collection_2.8.0</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>${pkgGroupId}:scalaj-collection_2.8.0</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

Added: servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/resources/OSGI-INF/bundle.info?rev=1137625&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/resources/OSGI-INF/bundle.info (added)
+++ servicemix/smx4/bundles/trunk/scalaj-collection-1.0/src/main/resources/OSGI-INF/bundle.info Mon Jun 20 13:22:20 2011
@@ -0,0 +1,8 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+\u001B[1mDESCRIPTION\u001B[0m
+    scalaj-collection is a library for converting between Java and Scala collections.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttps://github.com/scalaj/scalaj-collection\u001B[0m
\ No newline at end of file