Skip to content

Commit

Permalink
refactor(jboss72): remove specific jboss version from dirs/files - pa…
Browse files Browse the repository at this point in the history
…rt 1

related to CAM-1334
  • Loading branch information
hawky-4s- committed Oct 24, 2013
1 parent a94d93c commit 6a72c87
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ This will build all the modules that make up the camunda BPM platform but will n

distro/tomcat/distro/target (Apache Tomcat 7 Distribution)
distro/gf31/distro/target (Glassfish 3 Distribution)
distro/jbossas71/distro/target (JBoss AS 7 Distribution)
distro/jbossas7/distro/target (JBoss AS 7 Distribution)

Running Integration Tests
----------
Expand Down
8 changes: 4 additions & 4 deletions distro/jbossas71/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@
<outputDirectory></outputDirectory>
</file>
<file>
<source>src/jboss71/standalone.xml</source>
<source>src/jboss7/standalone.xml</source>
<outputDirectory>server/jboss-as-${version.jboss.as}/standalone/configuration</outputDirectory>
</file>
<file>
<source>src/jboss71/standalone-full.xml</source>
<source>src/jboss7/standalone-full.xml</source>
<outputDirectory>server/jboss-as-${version.jboss.as}/standalone/configuration</outputDirectory>
</file>
<file>
<source>src/jboss71/standalone.conf</source>
<source>src/jboss7/standalone.conf</source>
<outputDirectory>server/jboss-as-${version.jboss.as}/bin/</outputDirectory>
</file>
<file>
<source>src/jboss71/standalone.conf.bat</source>
<source>src/jboss7/standalone.conf.bat</source>
<outputDirectory>server/jboss-as-${version.jboss.as}/bin/</outputDirectory>
</file>
</files>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<module>examples/invoice</module>
<module>examples/wait-states</module>

<module>distro/jbossas71</module>
<module>distro/jbossas7</module>
<module>distro/gf31</module>
<module>distro/tomcat</module>
<module>distro/sql-script</module>
Expand Down Expand Up @@ -683,7 +683,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>1.3.3</version>
<version>1.4.5</version>
</plugin>
<plugin>
<groupId>net.kennychua</groupId>
Expand Down
2 changes: 1 addition & 1 deletion qa/integration-tests-webapps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<!-- Container configuration -->
<container>
<type>installed</type>
<containerId>jboss71x</containerId>
<containerId>jboss72x</containerId>
<append>false</append>
<home>${jboss.runtime}</home>
<timeout>60000</timeout>
Expand Down
2 changes: 1 addition & 1 deletion qa/jboss7-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>camunda BPM - QA jBoss7 Test Runtime</name>

<properties>
<jboss.assembly.location>../../distro/jbossas71/assembly/target/assembly-${project.version}/assembly-${project.version}/server</jboss.assembly.location>
<jboss.assembly.location>../../distro/jbossas7/assembly/target/assembly-${project.version}/assembly-${project.version}/server</jboss.assembly.location>
</properties>

<parent>
Expand Down

0 comments on commit 6a72c87

Please sign in to comment.