Skip to content

Commit

Permalink
JBTM-2222 Do not move the GAV for txframework
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjenkinson committed Mar 26, 2015
1 parent 299dd24 commit 2e7bf79
Show file tree
Hide file tree
Showing 59 changed files with 548 additions and 0 deletions.
5 changes: 5 additions & 0 deletions compensations/pom.xml
Expand Up @@ -157,6 +157,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.narayana.txframework</groupId>
<artifactId>txframework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>restat-util</artifactId>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Expand Up @@ -476,6 +476,7 @@
<module>rts</module>
<module>txbridge</module>
<module>STM</module>
<module>txframework</module>
<module>compensations</module>
<module>osgi</module>
<module>narayana-full</module>
Expand Down
4 changes: 4 additions & 0 deletions scripts/hudson/narayana.sh
Expand Up @@ -348,6 +348,10 @@ function jta_cdi_tests {
function compensations_tests {
echo "#0. compensations Test"
cp ./rts/at/webservice/target/restat-web-*.war $JBOSS_HOME/standalone/deployments
./build.sh -f ./txframework/pom.xml -P$ARQ_PROF "$@" test
[ $? = 0 ] || fatal "txframework build failed"
./build.sh -f ./txframework/pom.xml -P$ARQ_PROF-distributed "$@" test
[ $? = 0 ] || fatal "txframework build failed"
./build.sh -f ./compensations/pom.xml -P$ARQ_PROF "$@" test
[ $? = 0 ] || fatal "compensations build failed"
./build.sh -f ./compensations/pom.xml -P$ARQ_PROF-distributed "$@" test
Expand Down
425 changes: 425 additions & 0 deletions txframework/pom.xml

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions txframework/src/test/java/org/jboss/narayana/common/URLUtils.java
@@ -0,0 +1,36 @@
package org.jboss.narayana.common;

/**
* @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
*/
public final class URLUtils {

public String getBaseUrl() {

String baseAddress = System.getProperty("jboss.bind.address");

if (baseAddress == null) {
baseAddress = "http://localhost";
} else if (!baseAddress.toLowerCase().startsWith("http://") && !baseAddress.toLowerCase().startsWith("https://")) {
baseAddress = "http://" + baseAddress;
}

if (baseAddress.endsWith("/")) {
baseAddress = baseAddress.substring(0, baseAddress.length() - 1);
}

return baseAddress;
}

public String getBasePort() {

final String basePort = System.getProperty("jboss.bind.port");

if (basePort == null) {
return "8080";
}

return basePort;
}

}
40 changes: 40 additions & 0 deletions txframework/src/test/resources/arquillian.xml
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2012, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<engine>
<property name="deploymentExportPath">target/</property>
</engine>

<container qualifier="jboss" default="true">
<configuration>
<property name="serverConfig">${server.config}</property>
<property name="javaVmArguments">${server.jvm.args}</property>
<property name="managementAddress">${node.address}</property>
</configuration>
</container>

</arquillian>
36 changes: 36 additions & 0 deletions txframework/src/test/resources/persistence.xml
@@ -0,0 +1,36 @@
<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2012, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">

<persistence-unit name="bistro">
<jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
<properties>
<property name="hibernate.hbm2ddl.auto"
value="create-drop"/>
</properties>
</persistence-unit>

</persistence>
@@ -0,0 +1 @@
org.jboss.narayana.txframework.impl.as.TXFrameworkCDIExtension

0 comments on commit 2e7bf79

Please sign in to comment.