Skip to content
Permalink
Browse files
fixing work directory name and adding openejb assembly in batchee cli
  • Loading branch information
rmannibucau committed Mar 9, 2014
1 parent a84b13e commit d180e6f1babb515211d77d7c9e29e7f4d8aa14f7
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 6 deletions.
@@ -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>
@@ -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>
@@ -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;

0 comments on commit d180e6f

Please sign in to comment.