Skip to content
Permalink
Browse files
This closes #222
  • Loading branch information
aledsage committed Oct 15, 2014
2 parents 892a6ca + 8bb021e commit 877184f98a1c041742d0c0e3e846bc4626715455
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 12 deletions.
@@ -1,2 +1,3 @@
#Don't auto-convert line endings for shell scripts on Windows (breaks the scripts)
* text=auto
*.sh text eol=lf
@@ -149,7 +149,8 @@
<exclude>.*</exclude>
<exclude>**/*.png</exclude>
<exclude>.*/**</exclude>
<exclude>*.log</exclude>
<exclude>*.log</exclude>
<exclude>**/*.sh</exclude>
</excludes>
<replacements>
<!-- special chars in velocity have to be escaped.
@@ -178,7 +179,10 @@
<basedir>${basedir}/src/brooklyn-sample/</basedir>
<outputBasedir>${basedir}</outputBasedir>
<outputDir>src/main/resources/archetype-resources/</outputDir>
<includes> <include>**/*.png</include> </includes>
<includes>
<include>**/*.png</include>
<include>**/*.sh</include>
</includes>
<excludes>
<exclude>target/**</exclude>
<exclude>test-output/**</exclude>
@@ -40,6 +40,8 @@
-->

<properties>
<project.entry>com.acme.sample.SampleMain</project.entry>

<!-- Compilation -->
<java.version>1.6</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,21 +40,32 @@
</dependencySet>
</dependencySets>

<!--
Adds startup scripts to the root directory of zip package. The startup
scripts are located to src/main/scripts directory as stated by Maven
conventions.
-->
<files>
<file>
<source>src/main/assembly/scripts/start.sh</source>
<outputDirectory></outputDirectory>
<fileMode>0755</fileMode>
<filtered>true</filtered>
</file>
</files>
<fileSets>
<!--
Adds startup scripts to the root directory of zip package. The startup
scripts are located to src/main/scripts directory as stated by Maven
conventions.
-->
<fileSet>
<directory>src/main/assembly/scripts</directory>
<outputDirectory></outputDirectory>
<fileMode>0755</fileMode>
<includes>
<include>*</include>
</includes>
<excludes>
<exclude>start.sh</exclude>
</excludes>
</fileSet>
<!-- add additional files (but not marked executable) -->
<!-- add additional files (but not marked executable) -->
<fileSet>
<directory>src/main/assembly/files</directory>
<outputDirectory></outputDirectory>
@@ -75,4 +86,3 @@
</fileSet>
</fileSets>
</assembly>

@@ -29,12 +29,12 @@ if [ ! -x "$JAVA" ] ; then
exit 1
fi

if [[ ! `ls brooklyn-sample-*.jar 2> /dev/null` ]] ; then
if [[ ! `ls ${project.artifactId}-*.jar 2> /dev/null` ]] ; then
echo Command must be run from the directory where the JAR is installed.
exit 4
fi

$JAVA -Xms256m -Xmx1024m -XX:MaxPermSize=1024m \
-classpath "conf/:patch/*:*:lib/*" \
com.acme.sample.brooklyn.SampleMain \
${project.entry} \
"$@"
@@ -43,6 +43,7 @@
<directory></directory>
<includes>
<include>**/*.png</include>
<include>**/*.sh</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="false">
@@ -55,7 +56,8 @@
<exclude>src/main/java/**</exclude>
<exclude>src/test/java/**</exclude>
<exclude>pom.xml</exclude>
<exclude>**.png</exclude>
<exclude>**.png</exclude>
<exclude>**.sh</exclude>
</excludes>
</fileSet>
</fileSets>

0 comments on commit 877184f

Please sign in to comment.