From 7fa72ed49d0d0acb98d27115161464d450a6930d Mon Sep 17 00:00:00 2001
From: Tommaso Teofili <tommaso@apache.org>
Date: Mon, 10 Oct 2016 12:28:07 +0200
Subject: [PATCH 1/2] JOSHUA-290 - separate OSGi artifact for Joshua, based on
 7 branch

---
 joshua-osgi/pom.xml | 87 +++++++++++++++++++++++++++++++++++++++++++++
 pom.xml             |  1 +
 2 files changed, 88 insertions(+)
 create mode 100644 joshua-osgi/pom.xml

diff --git a/joshua-osgi/pom.xml b/joshua-osgi/pom.xml
new file mode 100644
index 00000000..e90dfc19
--- /dev/null
+++ b/joshua-osgi/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.joshua</groupId>
+    <artifactId>joshua-parent</artifactId>
+    <version>6.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>joshua-osgi</artifactId>
+  <packaging>bundle</packaging>
+  <name>Apache Joshua Machine Translation Toolkit - OSGi</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.apache.joshua.decoder</Export-Package>
+            <Import-Package>
+              com.google.common.*;version="[15,20)",
+              com.google.gson.*;version="[2.3.0,2.9.0)",
+            </Import-Package>
+            <Embed-Dependency>joshua-core,berkeleylm,args4j</Embed-Dependency>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>baseline</id>
+            <goals>
+              <goal>baseline</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <logResults>false</logResults>
+              <failOnWarning>false</failOnWarning>
+              <failOnError>true</failOnError>
+              </configuration>
+            </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>joshua-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>edu.berkeley.nlp</groupId>
+      <artifactId>berkeleylm</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>args4j</groupId>
+      <artifactId>args4j</artifactId>
+      <version>2.0.29</version>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+      <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index c80584d3..d1da8b03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,7 @@
   <modules>
     <module>joshua-core</module>
     <module>joshua-web</module>
+    <module>joshua-osgi</module>
   </modules>
 
   <dependencyManagement>

From c7f36a72956bdb407e78446c74c070ec1fce1df2 Mon Sep 17 00:00:00 2001
From: Tommaso Teofili <tommaso@apache.org>
Date: Mon, 10 Oct 2016 16:11:07 +0200
Subject: [PATCH 2/2] JOSHUA-290 - updated export / import package directives

---
 joshua-osgi/pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/joshua-osgi/pom.xml b/joshua-osgi/pom.xml
index e90dfc19..d6da9780 100644
--- a/joshua-osgi/pom.xml
+++ b/joshua-osgi/pom.xml
@@ -36,10 +36,16 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package>org.apache.joshua.decoder</Export-Package>
+            <Export-Package>
+              org.apache.joshua.decoder,
+              org.apache.joshua.decoder.segment_file,
+              org.apache.joshua.decoder.io
+            </Export-Package>
             <Import-Package>
               com.google.common.*;version="[15,20)",
               com.google.gson.*;version="[2.3.0,2.9.0)",
+              com.sun.net.*;resolution:=optional,
+              *
             </Import-Package>
             <Embed-Dependency>joshua-core,berkeleylm,args4j</Embed-Dependency>
           </instructions>
@@ -83,5 +89,59 @@
       <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jung</groupId>
+      <artifactId>jung-algorithms</artifactId>
+      <version>2.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jung</groupId>
+      <artifactId>jung-api</artifactId>
+      <version>2.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jung</groupId>
+      <artifactId>jung-graph-impl</artifactId>
+      <version>2.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.jung</groupId>
+      <artifactId>jung-visualization</artifactId>
+      <version>2.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>19.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4</version>
+    </dependency>
   </dependencies>
 </project>