You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ch...@apache.org on 2014/01/15 12:36:09 UTC
[1/5] git commit: DELTASPIKE-497 Added build-managed profile for
Glassfish 3.1
Updated Branches:
refs/heads/master 8c540614e -> 8078097eb
DELTASPIKE-497 Added build-managed profile for Glassfish 3.1
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/24982569
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/24982569
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/24982569
Branch: refs/heads/master
Commit: 2498256926474e3aeed8088cb655dfc95088bbe7
Parents: 8c54061
Author: Christian Kaltepoth <ch...@apache.org>
Authored: Mon Jan 13 17:06:47 2014 +0100
Committer: Christian Kaltepoth <ch...@apache.org>
Committed: Mon Jan 13 17:06:47 2014 +0100
----------------------------------------------------------------------
deltaspike/parent/code/pom.xml | 123 +++++++++++++++++++
.../src/main/resources/arquillian.xml | 8 ++
2 files changed, 131 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/24982569/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 9c59154..b3c6259 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -38,6 +38,7 @@
<container.unpack.directory>${java.io.tmpdir}/deltaspike-arquillian-containers</container.unpack.directory>
<jboss.as.version>7.1.1.Final</jboss.as.version>
<wildfly.version>8.0.0.CR1</wildfly.version>
+ <glassfish3.version>3.1.2.2</glassfish3.version>
</properties>
@@ -994,7 +995,129 @@
</profile>
+ <profile>
+ <!--
+ * Glassfish will be downloaded as maven dependency
+ *
+ * Start the build with:
+ * $> mvn clean install -Pglassfish-build-managed-3
+ *
+ -->
+ <id>glassfish-build-managed-3</id>
+ <properties>
+ <cdicontainer.version>weld-1.1.8</cdicontainer.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.0-SP4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-managed-3.1</artifactId>
+ <version>1.0.0.CR4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <arquillian.launch>glassfish-build-managed-3</arquillian.launch>
+ <arquillian.glassfish3_home>${container.unpack.directory}/glassfish3</arquillian.glassfish3_home>
+ <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>
+ <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
+ </systemProperties>
+ <!-- we just use groups to mark that a test should be executed only
+ with specific environments. even though a java-ee6 application server has to be able to run
+ all tests in theory, we have to exclude some tests because there are e.g. packaging issues or
+ there are currently issues with arquillian. if a test isn't restricted to an environment,
+ no category is used for the test-class. -->
+ <excludedGroups>
+ org.apache.deltaspike.test.category.SeCategory
+ </excludedGroups>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-glassfish3</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.glassfish.main.distributions</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>${glassfish3.version}</version>
+ <outputDirectory>${container.unpack.directory}</outputDirectory>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-glassfish3</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- Change all TCP ports from "xxxx" to "3xxxx" -->
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="port="8080"" value="port="38080"" />
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="port="8181"" value="port="38181"" />
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="port="4848"" value="port="34848"" />
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="port="3700"" value="port="33700"" />
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="port="8686"" value="port="38686"" />
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="port="7676"" value="port="37676"" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/24982569/deltaspike/test-utils/src/main/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/test-utils/src/main/resources/arquillian.xml b/deltaspike/test-utils/src/main/resources/arquillian.xml
index bad06cb..aca4120 100644
--- a/deltaspike/test-utils/src/main/resources/arquillian.xml
+++ b/deltaspike/test-utils/src/main/resources/arquillian.xml
@@ -95,4 +95,12 @@
</configuration>
</container>
+
+ <container qualifier="glassfish-build-managed-3">
+ <configuration>
+ <property name="glassFishHome">${arquillian.glassfish3_home}</property>
+ <property name="adminPort">34848</property>
+ </configuration>
+ </container>
+
</arquillian>
[5/5] git commit: DELTASPIKE-497 Fixed partial bean tests to work on
build-managed Glassfish
Posted by ch...@apache.org.
DELTASPIKE-497 Fixed partial bean tests to work on build-managed Glassfish
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8078097e
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8078097e
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8078097e
Branch: refs/heads/master
Commit: 8078097eb72ddd1bc5dbfaa3d223790062f911a8
Parents: 4814760
Author: Christian Kaltepoth <ch...@apache.org>
Authored: Wed Jan 15 11:22:59 2014 +0100
Committer: Christian Kaltepoth <ch...@apache.org>
Committed: Wed Jan 15 11:22:59 2014 +0100
----------------------------------------------------------------------
.../api/partialbean/uc002/PartialBeanAsAbstractClassTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8078097e/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc002/PartialBeanAsAbstractClassTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc002/PartialBeanAsAbstractClassTest.java b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc002/PartialBeanAsAbstractClassTest.java
index 649fd42..e8415de 100644
--- a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc002/PartialBeanAsAbstractClassTest.java
+++ b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc002/PartialBeanAsAbstractClassTest.java
@@ -57,7 +57,8 @@ public class PartialBeanAsAbstractClassTest
if (CdiContainerUnderTest.is("owb-.*") ||
CdiContainerUnderTest.is("tomee-.*") ||
- CdiContainerUnderTest.is("wildfly-.*"))
+ CdiContainerUnderTest.is("wildfly-.*") ||
+ CdiContainerUnderTest.is("glassfish-.*"))
{
JavaArchive javassistJar = ShrinkWrap.create(JavaArchive.class, "dsjavassist.jar")
.addPackages(true, "javassist");
[2/5] git commit: DELTASPIKE-497 Added build-managed profile for
Glassfish 4.0
Posted by ch...@apache.org.
DELTASPIKE-497 Added build-managed profile for Glassfish 4.0
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/1550c887
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/1550c887
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/1550c887
Branch: refs/heads/master
Commit: 1550c8870a6043253273ae176279de4951283e74
Parents: 2498256
Author: Christian Kaltepoth <ch...@apache.org>
Authored: Mon Jan 13 17:20:53 2014 +0100
Committer: Christian Kaltepoth <ch...@apache.org>
Committed: Mon Jan 13 17:20:53 2014 +0100
----------------------------------------------------------------------
deltaspike/parent/code/pom.xml | 126 +++++++++++++++++++
.../src/main/resources/arquillian.xml | 7 ++
2 files changed, 133 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1550c887/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index b3c6259..25953fc 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -39,6 +39,7 @@
<jboss.as.version>7.1.1.Final</jboss.as.version>
<wildfly.version>8.0.0.CR1</wildfly.version>
<glassfish3.version>3.1.2.2</glassfish3.version>
+ <glassfish4.version>4.0</glassfish4.version>
</properties>
@@ -1119,6 +1120,131 @@
</build>
</profile>
+ <profile>
+ <!--
+ * Glassfish will be downloaded as maven dependency
+ *
+ * Start the build with:
+ * $> mvn clean install -Pglassfish-build-managed-4
+ *
+ -->
+ <id>glassfish-build-managed-4</id>
+
+ <properties>
+ <cdicontainer.version>weld-2.0.0.SP1</cdicontainer.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.0-SP4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Also works fine with Glassfish 4.0 -->
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-managed-3.1</artifactId>
+ <version>1.0.0.CR4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <arquillian.launch>glassfish-build-managed-4</arquillian.launch>
+ <arquillian.glassfish4_home>${container.unpack.directory}/glassfish4</arquillian.glassfish4_home>
+ <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>
+ <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
+ </systemProperties>
+ <!-- we just use groups to mark that a test should be executed only
+ with specific environments. even though a java-ee6 application server has to be able to run
+ all tests in theory, we have to exclude some tests because there are e.g. packaging issues or
+ there are currently issues with arquillian. if a test isn't restricted to an environment,
+ no category is used for the test-class. -->
+ <excludedGroups>
+ org.apache.deltaspike.test.category.SeCategory
+ </excludedGroups>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-glassfish4</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.glassfish.main.distributions</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>${glassfish4.version}</version>
+ <outputDirectory>${container.unpack.directory}</outputDirectory>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-glassfish4</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- Change all TCP ports from "xxxx" to "2xxxx" -->
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="port="3700"" value="port="23700"" />
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="port="8181"" value="port="28181"" />
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="port="8686"" value="port="28686"" />
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="port="4848"" value="port="24848"" />
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="port="8080"" value="port="28080"" />
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="value="7676"" value="value="27676"" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1550c887/deltaspike/test-utils/src/main/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/test-utils/src/main/resources/arquillian.xml b/deltaspike/test-utils/src/main/resources/arquillian.xml
index aca4120..574c594 100644
--- a/deltaspike/test-utils/src/main/resources/arquillian.xml
+++ b/deltaspike/test-utils/src/main/resources/arquillian.xml
@@ -103,4 +103,11 @@
</configuration>
</container>
+ <container qualifier="glassfish-build-managed-4">
+ <configuration>
+ <property name="glassFishHome">${arquillian.glassfish4_home}</property>
+ <property name="adminPort">24848</property>
+ </configuration>
+ </container>
+
</arquillian>
[3/5] git commit: DELTASPIKE-497 Fixed data module tests to work on
build-managed Glassfish
Posted by ch...@apache.org.
DELTASPIKE-497 Fixed data module tests to work on build-managed Glassfish
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/e56e5467
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/e56e5467
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/e56e5467
Branch: refs/heads/master
Commit: e56e5467e931b2967bd4496e68cc80ec617b3184
Parents: 1550c88
Author: Christian Kaltepoth <ch...@apache.org>
Authored: Wed Jan 15 06:49:08 2014 +0100
Committer: Christian Kaltepoth <ch...@apache.org>
Committed: Wed Jan 15 06:49:08 2014 +0100
----------------------------------------------------------------------
deltaspike/modules/data/impl/pom.xml | 26 ++++++++++++++++++++
.../data/test/util/TestDeployments.java | 13 ++++++++++
deltaspike/parent/code/pom.xml | 24 ++++++++++++++++--
3 files changed, 61 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e56e5467/deltaspike/modules/data/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index ca4b150..7b262fb 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -217,6 +217,32 @@
</build>
</profile>
<profile>
+ <id>glassfish-build-managed-3</id>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-glassfish</directory>
+ </testResource>
+ </testResources>
+ </build>
+ </profile>
+ <profile>
+ <id>glassfish-build-managed-4</id>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-glassfish</directory>
+ </testResource>
+ </testResources>
+ </build>
+ </profile>
+ <profile>
<id>tomee-build-managed</id>
<build>
<testResources>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e56e5467/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
index 64042f4..d002913 100755
--- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
+++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
@@ -152,6 +152,19 @@ public abstract class TestDeployments
}
}
+ /*
+ * We need to add Javassist in case of Glassfish for the partial beans to work correctly. But as Javassist is
+ * not on the test classpath like for the OWB and TomEE profiles, it is added using the Shrinkwrap Maven
+ * resolver.
+ */
+ if (CdiContainerUnderTest.is("glassfish-.*"))
+ {
+ webArchive.addAsLibraries(Maven.resolver()
+ .resolve("javassist:javassist:3.12.0.GA")
+ .withTransitivity()
+ .asFile());
+ }
+
return webArchive;
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e56e5467/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 25953fc..278e88c 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -1007,7 +1007,7 @@
<id>glassfish-build-managed-3</id>
<properties>
- <cdicontainer.version>weld-1.1.8</cdicontainer.version>
+ <cdicontainer.version>glassfish-${glassfish3.version}</cdicontainer.version>
</properties>
<dependencies>
@@ -1111,6 +1111,16 @@
<replace
file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
token="port="7676"" value="port="37676"" />
+
+ <!-- Replace the default datasource with an in-memory one -->
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="datasource-classname="org.apache.derby.jdbc.ClientDataSource""
+ value="datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"" />
+ <replace
+ file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
+ token="value="sun-appserv-samples"" value="value="memory:deltaspike"" />
+
</target>
</configuration>
</execution>
@@ -1131,7 +1141,7 @@
<id>glassfish-build-managed-4</id>
<properties>
- <cdicontainer.version>weld-2.0.0.SP1</cdicontainer.version>
+ <cdicontainer.version>glassfish-${glassfish4.version}</cdicontainer.version>
</properties>
<dependencies>
@@ -1236,6 +1246,16 @@
<replace
file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
token="value="7676"" value="value="27676"" />
+
+ <!-- Replace the default datasource with an in-memory one -->
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="datasource-classname="org.apache.derby.jdbc.ClientDataSource""
+ value="datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"" />
+ <replace
+ file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
+ token="value="sun-appserv-samples"" value="value="memory:deltaspike"" />
+
</target>
</configuration>
</execution>
[4/5] git commit: DELTASPIKE-497 Use regular expressions to change
the ports in the build-managed Glassfish profiles
Posted by ch...@apache.org.
DELTASPIKE-497 Use regular expressions to change the ports in the build-managed Glassfish profiles
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/48147606
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/48147606
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/48147606
Branch: refs/heads/master
Commit: 4814760684233665b0314c2eacfc50a2932159d8
Parents: e56e546
Author: Christian Kaltepoth <ch...@apache.org>
Authored: Wed Jan 15 07:15:31 2014 +0100
Committer: Christian Kaltepoth <ch...@apache.org>
Committed: Wed Jan 15 07:15:31 2014 +0100
----------------------------------------------------------------------
deltaspike/parent/code/pom.xml | 37 ++++++-------------------------------
1 file changed, 6 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/48147606/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 278e88c..714f92e 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -1092,25 +1092,11 @@
</goals>
<configuration>
<target>
+
<!-- Change all TCP ports from "xxxx" to "3xxxx" -->
- <replace
- file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
- token="port="8080"" value="port="38080"" />
- <replace
- file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
- token="port="8181"" value="port="38181"" />
- <replace
- file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
- token="port="4848"" value="port="34848"" />
- <replace
- file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
- token="port="3700"" value="port="33700"" />
- <replace
- file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
- token="port="8686"" value="port="38686"" />
- <replace
+ <replaceregexp
file="${container.unpack.directory}/glassfish3/glassfish/domains/domain1/config/domain.xml"
- token="port="7676"" value="port="37676"" />
+ match="port="(\d{4})"" replace="port="3\1"" flags="g" />
<!-- Replace the default datasource with an in-memory one -->
<replace
@@ -1227,22 +1213,11 @@
</goals>
<configuration>
<target>
+
<!-- Change all TCP ports from "xxxx" to "2xxxx" -->
- <replace
- file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
- token="port="3700"" value="port="23700"" />
- <replace
- file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
- token="port="8181"" value="port="28181"" />
- <replace
- file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
- token="port="8686"" value="port="28686"" />
- <replace
- file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
- token="port="4848"" value="port="24848"" />
- <replace
+ <replaceregexp
file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
- token="port="8080"" value="port="28080"" />
+ match="port="(\d{4})"" replace="port="2\1"" flags="g" />
<replace
file="${container.unpack.directory}/glassfish4/glassfish/domains/domain1/config/domain.xml"
token="value="7676"" value="value="27676"" />