bug-fix plugin dependencies

olir · Mar 30, 2018 · c7eb5c6 · c7eb5c6
1 parent 6574736
commit c7eb5c6
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 13 deletions.
diff --git a/plugin-jogamp/java/pom.xml b/plugin-jogamp/java/pom.xml
@@ -28,7 +28,7 @@
       <artifactId>api</artifactId>
       <version>0.3.4-SNAPSHOT</version>
     </dependency>
-    <!-- jogamp
+    <!-- jogamp dependencies -->
     <dependency>
       <groupId>org.jogamp.gluegen</groupId>
       <artifactId>gluegen-rt-main</artifactId>
@@ -49,8 +49,7 @@
       <artifactId>joal-main</artifactId>
       <version>2.3.1</version>
     </dependency>
-    -->
-    </dependencies>
+  </dependencies>
 
    <build>
     <plugins>
@@ -134,7 +133,46 @@
 					</execution>
 				</executions>
       </plugin>
-
+
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.2</version>
+          <executions>
+        <execution>
+          <id>default-jar</id>
+            <phase>compile</phase>
+            <goals>
+          <goal>jar</goal>
+            </goals>
+            <configuration>
+            <outputDirectory>
+              ${project.basedir}/target/jws
+            </outputDirectory>
+          </configuration>
+        </execution>
+          </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+          <phase>package</phase>
+          <goals>
+            <goal>single</goal>
+          </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <finalName>${project.artifactId}-${project.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 

diff --git a/...-jogamp/java/src/main/java/de/serviceflow/frankenstein/plugin/jogamp/GLExampleFilter.java b/...-jogamp/java/src/main/java/de/serviceflow/frankenstein/plugin/jogamp/GLExampleFilter.java
@@ -14,6 +14,16 @@
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;
 
+import com.jogamp.opengl.DefaultGLCapabilitiesChooser;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLDrawableFactory;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
+import com.jogamp.opengl.util.gl2.GLUT;
+
 import de.serviceflow.frankenstein.plugin.api.FilterContext;
 import de.serviceflow.frankenstein.plugin.api.NativeSegmentFilter;
 import de.serviceflow.frankenstein.plugin.api.SegmentConfigController;
@@ -25,11 +35,11 @@ public class GLExampleFilter extends NativeSegmentFilter<GLExampleConfigControll
 
 	private final Method jniProxyProcessMethod;
 
-  /*
+
 	Mat glFrame;
 	GLProfile glp;
 	GLCapabilities caps;
-*/
+
 
 	@SuppressWarnings("unchecked")
 	public GLExampleFilter() {
@@ -40,7 +50,7 @@ public GLExampleFilter() {
 		} catch (NoSuchMethodException | SecurityException | IllegalArgumentException e) {
 			throw new RuntimeException("jni wrapper creation failed", e);
 		}
-/*
+
 		glp = GLProfile.getDefault();
 		caps = new GLCapabilities(glp);
 		caps.setHardwareAccelerated(true);
@@ -51,7 +61,7 @@ public GLExampleFilter() {
 		caps.setGreenBits(8);
 		caps.setDepthBits(24);
 		caps.setOnscreen(false);
-    */
+
 	}
 
 	@Override
@@ -64,7 +74,7 @@ public Mat process(Mat sourceFrame, int frameId, FilterContext context) {
 		// System.out.println("c = "+sourceFrame.cols()+" r =
 		// "+sourceFrame.rows());
 
-    /*
+
 		if (glFrame == null || glFrame.cols() != sourceFrame.cols() || glFrame.rows() != sourceFrame.rows()) {
 			glFrame = sourceFrame.clone();
 		}
@@ -83,7 +93,7 @@ public Mat process(Mat sourceFrame, int frameId, FilterContext context) {
 		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
 			e.printStackTrace();
 		}
-  */
+
 		return sourceFrame;
 	}
 
@@ -92,7 +102,7 @@ protected void initializeController() {
 		// getConfigController(). ...
 	}
 
-  /*
+
 	public GLAutoDrawable init(int width, int height) {
 		GLDrawableFactory factory = GLDrawableFactory.getFactory(glp);
 
@@ -127,7 +137,7 @@ private BufferedImage render(GLAutoDrawable drawable, int width, int height, int
 
 		return im;
 	}
-  */
+
 
 
 }
diff --git a/plugin-opencv/java/pom.xml b/plugin-opencv/java/pom.xml
@@ -134,7 +134,46 @@
 					</execution>
 				</executions>
       </plugin>
-
+
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.2</version>
+          <executions>
+        <execution>
+          <id>default-jar</id>
+            <phase>compile</phase>
+            <goals>
+          <goal>jar</goal>
+            </goals>
+            <configuration>
+            <outputDirectory>
+              ${project.basedir}/target/jws
+            </outputDirectory>
+          </configuration>
+        </execution>
+          </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+          <phase>package</phase>
+          <goals>
+            <goal>single</goal>
+          </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <finalName>${project.artifactId}-${project.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>