external library testcases: checkpoint 2
diff --git a/asterix-external-data/pom.xml b/asterix-external-data/pom.xml
index 9aac883..de106aa 100644
--- a/asterix-external-data/pom.xml
+++ b/asterix-external-data/pom.xml
@@ -41,18 +41,20 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </configuration>
<executions>
<execution>
- <configuration>
- <descriptor>src/main/assembly/binary-assembly-libjar.xml</descriptor>
- <finalName>testlib</finalName>
- </configuration>
- <phase>verify</phase>
<goals>
- <goal>attached</goal>
+ <goal>test-jar</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
@@ -63,9 +65,9 @@
<execution>
<configuration>
<descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor>
- <finalName>testlib</finalName>
+ <finalName>testlib-zip</finalName>
</configuration>
- <phase>verify</phase>
+ <phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
diff --git a/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml b/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml
index 6116b39..bec6e32 100644
--- a/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml
+++ b/asterix-external-data/src/main/assembly/binary-assembly-libzip.xml
@@ -9,7 +9,7 @@
<directory>target</directory>
<outputDirectory></outputDirectory>
<includes>
- <include>*external*.jar</include>
+ <include>*test*.jar</include>
</includes>
</fileSet>
<fileSet>
diff --git a/asterix-external-data/src/test/resources/text_functions.xml b/asterix-external-data/src/test/resources/text_functions.xml
index 2efd88a..e70d4a0 100644
--- a/asterix-external-data/src/test/resources/text_functions.xml
+++ b/asterix-external-data/src/test/resources/text_functions.xml
@@ -1,33 +1,37 @@
<library xmlns="library">
-<language>JAVA</language>
- <functions>
- <function>
- <function_type>SCALAR</function_type>
- <name>parseTweet</name>
- <arguments>TweetType</arguments>
- <return_type>TweetType</return_type>
- <definition>com.external.ParseTweetFactory</definition>
- </function>
- <function>
- <function_type>SCALAR</function_type>
- <name>mysum</name>
- <arguments>AINT32,AINT32</arguments>
- <return_type>AINT32</return_type>
- <definition>com.external.SumFactory</definition>
- </function>
- <function>
- <function_type>SCALAR</function_type>
- <name>toUpper</name>
- <arguments>TextType</arguments>
- <return_type>TextType</return_type>
- <definition>com.external.UpperCaseFactory</definition>
- </function>
- <function>
- <function_type>SCALAR</function_type>
- <name>allTypes</name>
- <arguments>AllType</arguments>
- <return_type>AllType</return_type>
- <definition>com.external.AllTypesFactory</definition>
- </function>
-</functions>
+ <language>JAVA</language>
+ <functions>
+ <function>
+ <function_type>SCALAR</function_type>
+ <name>parseTweet</name>
+ <arguments>TweetType</arguments>
+ <return_type>TweetType</return_type>
+ <definition>edu.uci.ics.asterix.external.library.ParseTweetFactory
+ </definition>
+ </function>
+ <function>
+ <function_type>SCALAR</function_type>
+ <name>mysum</name>
+ <arguments>AINT32,AINT32</arguments>
+ <return_type>AINT32</return_type>
+ <definition>edu.uci.ics.asterix.external.library.SumFactory
+ </definition>
+ </function>
+ <function>
+ <function_type>SCALAR</function_type>
+ <name>toUpper</name>
+ <arguments>TextType</arguments>
+ <return_type>TextType</return_type>
+ <definition>edu.uci.ics.asterix.external.library.UpperCaseFactory
+ </definition>
+ </function>
+ <function>
+ <function_type>SCALAR</function_type>
+ <name>allTypes</name>
+ <arguments>AllType</arguments>
+ <return_type>AllType</return_type>
+ <definition>edu.uci.ics.asterix.external.library.AllTypesFactory
+ </definition>
+ </function>
+ </functions>
</library>