You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by rm...@apache.org on 2014/03/09 19:16:24 UTC
git commit: fixing work directory name and adding openejb assembly in
batchee cli
Repository: incubator-batchee
Updated Branches:
refs/heads/master a84b13e0f -> d180e6f1b
fixing work directory name and adding openejb assembly in batchee cli
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/d180e6f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/d180e6f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/d180e6f1
Branch: refs/heads/master
Commit: d180e6f1babb515211d77d7c9e29e7f4d8aa14f7
Parents: a84b13e
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Sun Mar 9 19:16:09 2014 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Sun Mar 9 19:16:09 2014 +0100
----------------------------------------------------------------------
tools/cli/pom.xml | 23 +++-
tools/cli/src/main/assembly/bin-openejb.xml | 114 +++++++++++++++++++
.../batchee/cli/command/JobOperatorCommand.java | 4 +-
3 files changed, 135 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/d180e6f1/tools/cli/pom.xml
----------------------------------------------------------------------
diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml
index 6db24c6..87eacde 100644
--- a/tools/cli/pom.xml
+++ b/tools/cli/pom.xml
@@ -203,19 +203,34 @@
<goals>
<goal>attached</goal>
</goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <finalName>apache-batchee-${project.version}</finalName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assembly-bin-openejb-distributions</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-openejb.xml</descriptor>
+ </descriptors>
+ <finalName>apache-batchee-openejb-${project.version}</finalName>
+ </configuration>
</execution>
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
<archive>
<manifest>
<mainClass>org.apache.batchee.cli.BatchEECLI</mainClass>
</manifest>
</archive>
- <finalName>apache-batchee-${project.version}</finalName>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/d180e6f1/tools/cli/src/main/assembly/bin-openejb.xml
----------------------------------------------------------------------
diff --git a/tools/cli/src/main/assembly/bin-openejb.xml b/tools/cli/src/main/assembly/bin-openejb.xml
new file mode 100644
index 0000000..f8dd06c
--- /dev/null
+++ b/tools/cli/src/main/assembly/bin-openejb.xml
@@ -0,0 +1,114 @@
+<?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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>bin/</outputDirectory>
+ <includes>
+ <include>batchee</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/</directory>
+ <outputDirectory>bin/</outputDirectory>
+ <includes>
+ <include>batchee-cli-*-bootstrap.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/</directory>
+ <outputDirectory>lib/</outputDirectory>
+ <includes>
+ <include>batchee-cli-*-runner.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ <excludes>
+ <exclude>org.apache.batchee:batchee-cli</exclude> <!-- we use bootstrap and runner -->
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <scope>provided</scope>
+ <includes>
+ <include>org.apache.openejb:javaee-api</include>
+ <include>org.apache.openejb:openejb-api</include>
+ <include>org.apache.openejb:openejb-javaagent</include>
+ <include>org.apache.openejb:openejb-jee</include>
+ <include>org.apache.openejb:openejb-jee-accessors</include>
+ <include>org.apache.openejb:openejb-core</include>
+ <include>org.apache.openejb:openejb-loader</include>
+ <include>org.apache.openejb:openejb-jpa-integration</include>
+ <include>org.apache.openejb:mbean-annotation-api</include>
+ <include>org.quartz-scheduler:quartz</include>
+ <include>org.apache.openejb:openejb-shade-quartz</include> <!-- openejb >= 4.6.1 -->
+ <include>org.metatype.sxc:sxc-runtime</include>
+ <include>org.metatype.sxc:sxc-jaxb-core</include>
+ <include>org.apache.geronimo.components:geronimo-transaction</include>
+ <include>org.apache.xbean:xbean-asm4-shaded</include>
+ <include>org.apache.xbean:xbean-finder-shaded</include>
+ <!--<include>org.apache.xbean:xbean-reflect</include>--> <!-- already used by batchee -->
+ <include>org.apache.xbean:xbean-naming</include>
+ <include>org.hsqldb:hsqldb</include>
+ <include>commons-pool:commons-pool</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-jdk14</include>
+ <include>org.apache.openwebbeans:openwebbeans-impl</include>
+ <include>org.apache.openwebbeans:openwebbeans-spi</include>
+ <include>org.apache.openwebbeans:openwebbeans-ee</include>
+ <include>org.apache.openwebbeans:openwebbeans-ee-common</include>
+ <include>org.apache.openwebbeans:openwebbeans-ejb</include>
+ <include>org.apache.openwebbeans:openwebbeans-web</include>
+ <include>org.apache.openwebbeans:openwebbeans-el22</include>
+ <include>org.apache.openjpa:openjpa</include> <!-- openejb >= 4.6.0 -->
+ <include>org.apache.openejb.patch:openjpa</include>
+ <include>org.apache.bval:bval-core</include>
+ <include>org.apache.bval:bval-jsr303</include>
+ <include>commons-beanutils:commons-beanutils-core</include>
+ <include>commons-lang:commons-lang</include>
+ <include>commons-collections:commons-collections</include>
+ <include>net.sourceforge.serp:serp</include>
+ <include>commons-cli:commons-cli</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/d180e6f1/tools/cli/src/main/java/org/apache/batchee/cli/command/JobOperatorCommand.java
----------------------------------------------------------------------
diff --git a/tools/cli/src/main/java/org/apache/batchee/cli/command/JobOperatorCommand.java b/tools/cli/src/main/java/org/apache/batchee/cli/command/JobOperatorCommand.java
index c0037d8..bb2b505 100644
--- a/tools/cli/src/main/java/org/apache/batchee/cli/command/JobOperatorCommand.java
+++ b/tools/cli/src/main/java/org/apache/batchee/cli/command/JobOperatorCommand.java
@@ -104,8 +104,8 @@ public abstract class JobOperatorCommand implements Runnable {
@Option(name = "-archive", description = "a bar archive")
private String archive = null;
- @Option(name = "-work", description = "work directory (default to java.io.tmp)")
- private String work = System.getProperty("batchee.home", System.getProperty("java.io.tmpdir")) + "/batchee";
+ @Option(name = "-work", description = "work directory (default to java.io.tmp/work)")
+ private String work = System.getProperty("batchee.home", System.getProperty("java.io.tmpdir")) + "/work";
@Option(name = "-shared-libs", description = "folder containing shared libraries, the folder is added too to the loader")
private String sharedLibs = null;