You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2013/08/28 22:51:12 UTC
[1/3] git commit: ignore log files
Updated Branches:
refs/heads/master 878eab3a8 -> a37851c6a
ignore log files
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/abccb450
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/abccb450
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/abccb450
Branch: refs/heads/master
Commit: abccb450e65d2f38188911c4470a29240bb9292e
Parents: 878eab3
Author: Mark Struberg <st...@apache.org>
Authored: Wed Aug 28 22:37:17 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Aug 28 22:37:17 2013 +0200
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/abccb450/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index c05fd79..6e0d613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ atlassian-ide-plugin.xml
deltaspike/core/impl/data
deltaspike/modules/jsf/impl/data
deltaspike/modules/security/impl/data
+*.log
[2/3] git commit: add small helper script to quickly verify most
important scenarios
Posted by st...@apache.org.
add small helper script to quickly verify most important scenarios
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/ce7f1b2f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/ce7f1b2f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/ce7f1b2f
Branch: refs/heads/master
Commit: ce7f1b2f0c49c2c536f16595888caaf893108ee0
Parents: abccb45
Author: Mark Struberg <st...@apache.org>
Authored: Wed Aug 28 22:40:29 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Aug 28 22:40:29 2013 +0200
----------------------------------------------------------------------
deltaspike/buildall.sh | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ce7f1b2f/deltaspike/buildall.sh
----------------------------------------------------------------------
diff --git a/deltaspike/buildall.sh b/deltaspike/buildall.sh
new file mode 100755
index 0000000..840fefb
--- /dev/null
+++ b/deltaspike/buildall.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#####################################################################################
+# 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.
+#####################################################################################
+#
+# this is a small helper script for building a few container constellations locally
+# you can easily check the output via $> tail mvn-*.log | less
+#
+#####################################################################################
+
+rm mvn-*log
+mvn clean install -POWB -Dowb.version=1.1.8 | tee mvn-owb1_1_8.log
+mvn clean install -POWB -Dowb.version=1.2.1-SNAPSHOT -Dopenejb.owb.version=1.1.8 | tee mvn-owb1_2_1.log
+mvn clean install -PWeld -Dweld.version=1.1.10.Final | tee mvn-weld1_1_10.log
+mvn clean install -Ptomee-build-managed -Dtomee.version=1.6.0-SNAPSHOT -Dopenejb.version=4.6.0-SNAPSHOT -Dopenejb.owb.version=1.2.1-SNAPSHOT | tee mvn-tomee_1_6_0.log
+mvn clean install -Ptomee-build-managed -Dtomee.version=1.5.2 -Dopenejb.version=4.5.2 -Dopenejb.owb.version=1.1.8 | tee mvn-tomee_1_5_2.log
+mvn clean install -Pjbossas-build-managed-7 | tee mvn-jbossas_7.log
+
[3/3] git commit: DELTASPIKE-380 add javassist to @Deployment for
some containers
Posted by st...@apache.org.
DELTASPIKE-380 add javassist to @Deployment for some containers
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a37851c6
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a37851c6
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a37851c6
Branch: refs/heads/master
Commit: a37851c6aba102d30e6acc33ac5c2098af7ac3eb
Parents: ce7f1b2
Author: Mark Struberg <st...@apache.org>
Authored: Wed Aug 28 22:41:25 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Aug 28 22:41:25 2013 +0200
----------------------------------------------------------------------
.../deltaspike/data/test/util/TestDeployments.java | 12 +++++++++++-
.../uc002/PartialBeanAsAbstractClassTest.java | 13 ++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a37851c6/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 77431fa..b55b1e4 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
@@ -51,6 +51,7 @@ import org.apache.deltaspike.data.spi.QueryInvocationContext;
import org.apache.deltaspike.data.test.TransactionalTestCase;
import org.apache.deltaspike.data.test.domain.AuditedEntity;
import org.apache.deltaspike.test.category.WebProfileCategory;
+import org.apache.deltaspike.test.utils.CdiContainerUnderTest;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -126,7 +127,7 @@ public abstract class TestDeployments
public static WebArchive addDependencies(WebArchive archive)
{
- return archive.addAsLibraries(
+ WebArchive webArchive= archive.addAsLibraries(
Maven.resolver().loadPomFromFile("pom.xml").resolve(
"org.apache.deltaspike.core:deltaspike-core-api",
"org.apache.deltaspike.core:deltaspike-core-impl",
@@ -134,6 +135,15 @@ public abstract class TestDeployments
"org.apache.deltaspike.modules:deltaspike-partial-bean-module-impl")
.withTransitivity()
.asFile());
+ if (CdiContainerUnderTest.is("owb-.*") ||
+ CdiContainerUnderTest.is("tomee-.*"))
+ {
+ JavaArchive javassistJar = ShrinkWrap.create(JavaArchive.class, "dsjavassist.jar")
+ .addPackages(true, "javassist");
+ webArchive.addAsLibrary(javassistJar);
+ }
+
+ return webArchive;
}
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a37851c6/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 eec97c3..3373ca1 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
@@ -20,6 +20,7 @@ package org.apache.deltaspike.test.core.api.partialbean.uc002;
import org.apache.deltaspike.test.core.api.partialbean.shared.TestPartialBeanBinding;
import org.apache.deltaspike.test.core.api.partialbean.util.ArchiveUtils;
+import org.apache.deltaspike.test.utils.CdiContainerUnderTest;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -49,10 +50,20 @@ public class PartialBeanAsAbstractClassTest
.addPackage(TestPartialBeanBinding.class.getPackage())
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
- return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
+ WebArchive webArchive = ShrinkWrap.create(WebArchive.class, archiveName + ".war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndPartialBeanArchive())
.addAsLibraries(testJar)
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+
+ if (CdiContainerUnderTest.is("owb-.*") ||
+ CdiContainerUnderTest.is("tomee-.*"))
+ {
+ JavaArchive javassistJar = ShrinkWrap.create(JavaArchive.class, "dsjavassist.jar")
+ .addPackages(true, "javassist");
+ webArchive.addAsLibrary(javassistJar);
+ }
+
+ return webArchive;
}
@Test