Merge pull request motech#415 from lkukielka/MOTECH-1450

MOTECH-1450 Fixed copying jars and standalone admin test

Author: pgesek

modules/admin/pom.xml

@@ -313,6 +313,53 @@
                 <groupId>com.github.searls</groupId>
                 <artifactId>jasmine-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-upload-test-bundle-to-target</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>motech-upload-test-bundle</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target/test-bundle/</outputDirectory>
+                                    <destFileName>motech-upload-test-bundle.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-upload-test-bundle</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>motech-upload-test-bundle</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${user.home}/.motech/bundles</outputDirectory>
+                                    <destFileName>motech-upload-test-bundle.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

modules/admin/src/test/java/org/motechproject/admin/it/AdminBundleIT.java

@@ -139,7 +139,7 @@ public void testUploadBundleFromRepository() throws IOException, InterruptedExce
 
     @Test
     public void testUploadBundleFromFile() throws IOException, InterruptedException {
-        File file = new File("src/test/resources/motech-upload-test-bundle.jar");
+        File file = new File("target/test-bundle/motech-upload-test-bundle.jar");
 
         uploadBundle("File", null, file, "on", "motech-upload-test-bundle");
     }
@@ -164,6 +164,7 @@ private void uploadBundle(String moduleSource, String moduleId, File bundleFile,
         entity.addTextBody("startBundle", startBundle, ContentType.MULTIPART_FORM_DATA);
         httpPost.setEntity(entity.build());
 
+
         int bundlesCountBeforeUpload = bundleContext.getBundles().length;
         HttpResponse response = getHttpClient().execute(httpPost);
         EntityUtils.consume(response.getEntity());

modules/testing-utils/upload-test-bundle/pom.xml

@@ -32,48 +32,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-bundles</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${user.home}/.motech/bundles</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>target</directory>
-                                    <includes>
-                                        <include>*.jar</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-bundle-to-admin-test-resources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>../../admin/src/test/resources/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>target</directory>
-                                    <includes>
-                                        <include>*.jar</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>