accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlmar...@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-2118: Addressed issues from comments: used JAVA_HOME in script, build jars always, remove jars from source
Date Tue, 10 May 2016 20:37:18 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master a6ecb7a41 -> e2856a4da


ACCUMULO-2118: Addressed issues from comments: used JAVA_HOME in script, build jars always,
remove jars from source


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/443f2209
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/443f2209
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/443f2209

Branch: refs/heads/master
Commit: 443f220999489fac7c729bf21a2bcc9af57bd2f3
Parents: 9dec120
Author: Dave Marion <dlmarion@apache.org>
Authored: Tue May 10 16:34:19 2016 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Tue May 10 16:34:19 2016 -0400

----------------------------------------------------------------------
 start/pom.xml                                   |  63 +++++++++----------
 .../test/resources/ClassLoaderTestA/Test.jar    | Bin 761 -> 0 bytes
 .../test/resources/ClassLoaderTestB/Test.jar    | Bin 761 -> 0 bytes
 .../test/resources/ClassLoaderTestC/Test.jar    | Bin 760 -> 0 bytes
 start/src/test/resources/HelloWorld.jar         | Bin 692 -> 0 bytes
 start/src/test/resources/HelloWorld2.jar        | Bin 692 -> 0 bytes
 start/src/test/shell/makeHelloWorldJars.sh      |  16 ++---
 start/src/test/shell/makeTestJars.sh            |   9 ++-
 8 files changed, 40 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index cf50df0..bc6c4b6 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -104,40 +104,33 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>Build Test jars</id>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <executable>${project.basedir}/src/test/shell/makeTestJars.sh</executable>
+            </configuration>
+          </execution>
+          <execution>
+            <id>Build HelloWorld jars</id>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <executable>${project.basedir}/src/test/shell/makeHelloWorldJars.sh</executable>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>buildJars</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>Build Test jars</id>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <phase>generate-sources</phase>
-                <configuration>
-                  <executable>${project.basedir}/src/test/shell/makeTestJars.sh</executable>
-                </configuration>
-              </execution>
-              <execution>
-                <id>Build HelloWorld jars</id>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <phase>generate-sources</phase>
-                <configuration>
-                  <executable>${project.basedir}/src/test/shell/makeHelloWorldJars.sh</executable>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/src/test/resources/ClassLoaderTestA/Test.jar
----------------------------------------------------------------------
diff --git a/start/src/test/resources/ClassLoaderTestA/Test.jar b/start/src/test/resources/ClassLoaderTestA/Test.jar
deleted file mode 100644
index 58d3e9a..0000000
Binary files a/start/src/test/resources/ClassLoaderTestA/Test.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/src/test/resources/ClassLoaderTestB/Test.jar
----------------------------------------------------------------------
diff --git a/start/src/test/resources/ClassLoaderTestB/Test.jar b/start/src/test/resources/ClassLoaderTestB/Test.jar
deleted file mode 100644
index 11d68e1..0000000
Binary files a/start/src/test/resources/ClassLoaderTestB/Test.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/src/test/resources/ClassLoaderTestC/Test.jar
----------------------------------------------------------------------
diff --git a/start/src/test/resources/ClassLoaderTestC/Test.jar b/start/src/test/resources/ClassLoaderTestC/Test.jar
deleted file mode 100644
index f5e12b3..0000000
Binary files a/start/src/test/resources/ClassLoaderTestC/Test.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/src/test/resources/HelloWorld.jar
----------------------------------------------------------------------
diff --git a/start/src/test/resources/HelloWorld.jar b/start/src/test/resources/HelloWorld.jar
deleted file mode 100644
index 28cd1f7..0000000
Binary files a/start/src/test/resources/HelloWorld.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/src/test/resources/HelloWorld2.jar
----------------------------------------------------------------------
diff --git a/start/src/test/resources/HelloWorld2.jar b/start/src/test/resources/HelloWorld2.jar
deleted file mode 100644
index 365f615..0000000
Binary files a/start/src/test/resources/HelloWorld2.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/src/test/shell/makeHelloWorldJars.sh
----------------------------------------------------------------------
diff --git a/start/src/test/shell/makeHelloWorldJars.sh b/start/src/test/shell/makeHelloWorldJars.sh
index f6c32da..9f4a990 100755
--- a/start/src/test/shell/makeHelloWorldJars.sh
+++ b/start/src/test/shell/makeHelloWorldJars.sh
@@ -15,12 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-mkdir -p target/HelloWorld/test
-sed "s/%%/Hello World\!/" < src/test/java/test/HelloWorldTemplate > target/HelloWorld/test/HelloWorld.java
-javac target/HelloWorld/test/HelloWorld.java -d target/HelloWorld
-jar -cf src/test/resources/HelloWorld.jar -C target/HelloWorld test/HelloWorld.class
+mkdir -p target/generated-sources/HelloWorld/test
+sed "s/%%/Hello World\!/" < src/test/java/test/HelloWorldTemplate > target/generated-sources/HelloWorld/test/HelloWorld.java
+$JAVA_HOME/bin/javac target/generated-sources/HelloWorld/test/HelloWorld.java -d target/generated-sources/HelloWorld
+$JAVA_HOME/bin/jar -cf target/test-classes/HelloWorld.jar -C target/generated-sources/HelloWorld
test/HelloWorld.class
 
-mkdir -p target/HalloWelt/test
-sed "s/%%/Hallo Welt/" < src/test/java/test/HelloWorldTemplate > target/HalloWelt/test/HelloWorld.java
-javac target/HalloWelt/test/HelloWorld.java -d target/HalloWelt
-jar -cf src/test/resources/HelloWorld2.jar -C target/HalloWelt test/HelloWorld.class
+mkdir -p target/generated-sources/HalloWelt/test
+sed "s/%%/Hallo Welt/" < src/test/java/test/HelloWorldTemplate > target/generated-sources/HalloWelt/test/HelloWorld.java
+$JAVA_HOME/bin/javac target/generated-sources/HalloWelt/test/HelloWorld.java -d target/generated-sources/HalloWelt
+$JAVA_HOME/bin/jar -cf target/test-classes/HelloWorld2.jar -C target/generated-sources/HalloWelt
test/HelloWorld.class

http://git-wip-us.apache.org/repos/asf/accumulo/blob/443f2209/start/src/test/shell/makeTestJars.sh
----------------------------------------------------------------------
diff --git a/start/src/test/shell/makeTestJars.sh b/start/src/test/shell/makeTestJars.sh
index 61d5e74..d4dc9fc 100755
--- a/start/src/test/shell/makeTestJars.sh
+++ b/start/src/test/shell/makeTestJars.sh
@@ -17,9 +17,8 @@
 
 for x in A B C
 do
-    sed "s/testX/test$x/" < src/test/java/test/TestTemplate > src/test/java/test/TestObject.java
-    mkdir -p target/$x
-    javac -cp src/test/java src/test/java/test/TestObject.java -d target/$x
-    jar -cf src/test/resources/ClassLoaderTest$x/Test.jar -C target/$x test/TestObject.class
-    rm -f src/test/java/test/TestObject.java
+    mkdir -p target/generated-sources/$x/test target/test-classes/ClassLoaderTest$x
+    sed "s/testX/test$x/" < src/test/java/test/TestTemplate > target/generated-sources/$x/test/TestObject.java
+    $JAVA_HOME/bin/javac -cp target/test-classes target/generated-sources/$x/test/TestObject.java
-d target/generated-sources/$x
+    $JAVA_HOME/bin/jar -cf target/test-classes/ClassLoaderTest$x/Test.jar -C target/generated-sources/$x
test/TestObject.class
 done


Mime
View raw message