You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/10 13:32:17 UTC
[1/7] tomee git commit: Removed older version of
arquillian-persistence, added arquillian-universe
Repository: tomee
Updated Branches:
refs/heads/master 9098aafec -> 80717c2eb
Removed older version of arquillian-persistence, added arquillian-universe
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a0665a17
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a0665a17
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a0665a17
Branch: refs/heads/master
Commit: a0665a1752e5e8da26b7c0c494b1f777c18cbe99
Parents: ab4cbe1
Author: Josh Juneau <ju...@fnal.gov>
Authored: Sat Dec 8 21:41:22 2018 -0600
Committer: Josh Juneau <ju...@fnal.gov>
Committed: Sat Dec 8 21:41:22 2018 -0600
----------------------------------------------------------------------
examples/arquillian-jpa/pom.xml | 227 +++++++++++++++++++----------------
1 file changed, 121 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a0665a17/examples/arquillian-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml
index 681e904..339c6fe 100644
--- a/examples/arquillian-jpa/pom.xml
+++ b/examples/arquillian-jpa/pom.xml
@@ -1,115 +1,130 @@
<!-- 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. -->
+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. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.superbiz</groupId>
- <artifactId>arquillian-jpa</artifactId>
- <name>OpenEJB :: Examples :: Arquillian Persistence Extension Sample</name>
- <version>8.0.0-SNAPSHOT</version>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz</groupId>
+ <artifactId>arquillian-jpa</artifactId>
+ <name>OpenEJB :: Examples :: Arquillian Persistence Extension Sample</name>
+ <version>8.0.0-SNAPSHOT</version>
- <properties>
- <arquillian.version>1.1.10.Final</arquillian.version>
- <arquillian-persistence.version>1.0.0.Alpha7</arquillian-persistence.version>
- <tomee.version>8.0.0-SNAPSHOT</tomee.version>
+ <properties>
+ <arquillian_universe.version>1.2.0.1</arquillian_universe.version>
+ <tomee.version>8.0.0-SNAPSHOT</tomee.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <repositories>
- <repository>
- <id>apache-m2-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/content/groups/snapshots</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/content/groups/snapshots</url>
+ </repository>
+ </repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>8.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>openejb-core</artifactId>
- <version>8.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.config</groupId>
- <artifactId>arquillian-config-api</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-persistence-dbunit</artifactId>
- <version>${arquillian-persistence.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>arquillian-transaction-jta</artifactId>
- <groupId>org.jboss.arquillian.extension</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <!--
- This section allows you to configure where to publish libraries for sharing.
- It is not required and may be deleted. For more information see:
- http://maven.apache.org/plugins/maven-deploy-plugin/
- -->
- <distributionManagement>
- <repository>
- <id>localhost</id>
- <url>file://${basedir}/target/repo/</url>
- </repository>
- <snapshotRepository>
- <id>localhost</id>
- <url>file://${basedir}/target/snapshot-repo/</url>
- </snapshotRepository>
- </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>8.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.config</groupId>
+ <artifactId>arquillian-config-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.arquillian.universe</groupId>
+ <artifactId>arquillian-persistence</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.arquillian.universe</groupId>
+ <artifactId>arquillian-transaction-jta</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.arquillian.extension</groupId>
+ <artifactId>arquillian-transaction-jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.arquillian</groupId>
+ <artifactId>arquillian-universe</artifactId>
+ <version>${arquillian_universe.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!--
+ This section allows you to configure where to publish libraries for sharing.
+ It is not required and may be deleted. For more information see:
+ http://maven.apache.org/plugins/maven-deploy-plugin/
+ -->
+ <distributionManagement>
+ <repository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/repo/</url>
+ </repository>
+ <snapshotRepository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/snapshot-repo/</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
[7/7] tomee git commit: Merge remote-tracking branch 'apache/master'
Posted by jg...@apache.org.
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/80717c2e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/80717c2e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/80717c2e
Branch: refs/heads/master
Commit: 80717c2eb10da2d773e53e8497a66a79ea061c45
Parents: ff9a079 9098aaf
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Dec 10 13:31:43 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Dec 10 13:31:43 2018 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/7] tomee git commit: Repaired PersistenceTest by adding embedded
TransactionBean to assist with transaction management
Posted by jg...@apache.org.
Repaired PersistenceTest by adding embedded TransactionBean to assist with transaction management
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5d6822ee
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5d6822ee
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5d6822ee
Branch: refs/heads/master
Commit: 5d6822ee014f1361741ed377cac6d20727ab3792
Parents: a0665a1
Author: Josh Juneau <ju...@fnal.gov>
Authored: Sun Dec 9 01:18:20 2018 -0600
Committer: Josh Juneau <ju...@fnal.gov>
Committed: Sun Dec 9 01:18:20 2018 -0600
----------------------------------------------------------------------
.../test/persistence/PersistenceTest.java | 40 ++++++++++++++++++--
1 file changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d6822ee/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java b/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
index 2cb01e3..3152177 100644
--- a/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
+++ b/examples/arquillian-jpa/src/test/java/org/superbiz/arquillian/test/persistence/PersistenceTest.java
@@ -16,6 +16,11 @@
*/
package org.superbiz.arquillian.test.persistence;
+import java.util.concurrent.Callable;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.persistence.ShouldMatchDataSet;
@@ -47,17 +52,44 @@ public class PersistenceTest {
@PersistenceContext
private EntityManager em;
+
+ @EJB
+ private Caller transactionalCaller;
+
+ public void seriouslyYouAlreadyForgotOpenEJB_questionMark() throws Exception {
+
+ final User user = em.find(User.class, 2L);
+ assertNotNull(user);
+
+ user.setName("OpenEJB"); // @Transactional(TransactionMode.COMMIT) will commit it and datasets/expected-users.yml will check it
+ }
+
@Test
@Transactional(TransactionMode.COMMIT) // default with persistence extension
@UsingDataSet("datasets/users.yml")
@ShouldMatchDataSet("datasets/expected-users.yml")
- public void seriouslyYouAlreadyForgotOpenEJB_questionMark() throws Exception {
+ public void testWithTransaction() throws Exception {
assertEquals(2, em.createQuery("select count(e) from User e", Number.class).getSingleResult().intValue());
- final User user = em.find(User.class, 2L);
- assertNotNull(user);
+ transactionalCaller.call(new Callable() {
+ public Object call() throws Exception {
+ seriouslyYouAlreadyForgotOpenEJB_questionMark();
+ return null;
+ }
+ });
+ }
+
+ public static interface Caller {
+ public <V> V call(Callable<V> callable) throws Exception;
+ }
+
+ @Stateless
+ @TransactionAttribute(REQUIRES_NEW)
+ public static class TransactionBean implements Caller {
- user.setName("OpenEJB"); // @Transactional(TransactionMode.COMMIT) will commit it and datasets/expected-users.yml will check it
+ public <V> V call(Callable<V> callable) throws Exception {
+ return callable.call();
+ }
}
}
[4/7] tomee git commit: Merge branch 'master' of
https://github.com/juneau001/tomee
Posted by jg...@apache.org.
Merge branch 'master' of https://github.com/juneau001/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b41f4f05
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b41f4f05
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b41f4f05
Branch: refs/heads/master
Commit: b41f4f0590e8431e4883f2711b951e585081d736
Parents: 24a8293 5d6822e
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Dec 10 10:41:14 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Dec 10 10:41:14 2018 +0000
----------------------------------------------------------------------
examples/arquillian-jpa/pom.xml | 227 ++++++++++---------
.../test/persistence/PersistenceTest.java | 40 +++-
2 files changed, 157 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
[3/7] tomee git commit: Merge branch 'optmization_string' of
https://github.com/otaviojava/tomee
Posted by jg...@apache.org.
Merge branch 'optmization_string' of https://github.com/otaviojava/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/24a8293c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/24a8293c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/24a8293c
Branch: refs/heads/master
Commit: 24a8293cea155e511c437d66eb703b9cd56565fe
Parents: 326832e fbe2c48
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Dec 10 10:40:40 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Dec 10 10:40:40 2018 +0000
----------------------------------------------------------------------
.../openejb/assembler/classic/Assembler.java | 4 +--
.../openejb/assembler/classic/EjbResolver.java | 2 +-
.../openejb/assembler/classic/JndiBuilder.java | 2 +-
.../java/org/apache/openejb/cli/Bootstrap.java | 6 ++---
.../java/org/apache/openejb/cli/MainImpl.java | 6 ++---
.../openejb/config/AnnotationDeployer.java | 28 ++++++++++----------
.../openejb/config/EjbJarInfoBuilder.java | 4 +--
.../openejb/config/InitEjbDeployments.java | 2 +-
.../config/PersistenceContextAnnFactory.java | 2 +-
.../openejb/config/QuickServerXmlParser.java | 2 +-
.../org/apache/openejb/config/ServiceUtils.java | 12 ++++-----
.../openejb/core/ivm/naming/IvmContext.java | 10 +++----
.../openejb/core/timer/EJBCronTrigger.java | 2 +-
.../openejb/core/webservices/JaxWsUtils.java | 6 ++---
.../resource/jdbc/dbcp/BasicDataSource.java | 2 +-
.../jdbc/dbcp/BasicManagedDataSource.java | 2 +-
.../resource/jdbc/router/FailOverRouter.java | 2 +-
.../apache/openejb/util/AnnotationFinder.java | 2 +-
.../openejb/util/IntrospectionSupport.java | 2 +-
.../apache/openejb/util/Log4jPrintWriter.java | 4 +--
.../java/org/apache/openejb/util/Logger.java | 4 +--
.../apache/openejb/util/LoggingPrintWriter.java | 4 +--
.../java/org/apache/openejb/util/Messages.java | 2 +-
.../java/org/apache/openejb/util/Strings.java | 2 +-
.../org/apache/openejb/util/URISupport.java | 10 +++----
.../org/apache/openejb/util/UpdateChecker.java | 2 +-
.../java/org/apache/openejb/util/UrlCache.java | 2 +-
.../util/proxy/LocalBeanProxyFactory.java | 2 +-
.../openejb/web/LightweightWebAppBuilder.java | 2 +-
.../config/rules/ValidationKeysAuditorTest.java | 4 +--
.../org/apache/openejb/javaagent/Agent.java | 2 +-
.../jee/HandlerChainsStringQNameAdapter.java | 2 +-
.../openejb/jee/oejb2/NamespaceFilter.java | 2 +-
.../java/org/apache/openejb/loader/Options.java | 12 ++++-----
.../loader/provisining/MavenResolver.java | 2 +-
35 files changed, 78 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
[6/7] tomee git commit: NO-JIRA updating name
Posted by jg...@apache.org.
NO-JIRA updating name
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ff9a079c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ff9a079c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ff9a079c
Branch: refs/heads/master
Commit: ff9a079c70b6d709d94d038175013b31c23b694c
Parents: 22eb8c5
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Dec 10 10:42:47 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Dec 10 10:42:47 2018 +0000
----------------------------------------------------------------------
examples/mvc-cxf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff9a079c/examples/mvc-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mvc-cxf/pom.xml b/examples/mvc-cxf/pom.xml
index a18fa24..c0f5bb2 100644
--- a/examples/mvc-cxf/pom.xml
+++ b/examples/mvc-cxf/pom.xml
@@ -25,7 +25,7 @@
<artifactId>mvc-cxf</artifactId>
<packaging>war</packaging>
- <name>mvc-cxf</name>
+ <name>OpenEJB :: Examples :: MVC (CXF-based)</name>
<description>OpenEJB :: Web Examples :: MVC 1.0 - Deltaspike</description>
<version>8.0.0-SNAPSHOT</version>
<url>http://tomee.apache.org</url>
[5/7] tomee git commit: Merge branch 'fix-examples' of
https://github.com/brunobat/tomee
Posted by jg...@apache.org.
Merge branch 'fix-examples' of https://github.com/brunobat/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/22eb8c57
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/22eb8c57
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/22eb8c57
Branch: refs/heads/master
Commit: 22eb8c572e5b9fb8172be6c8da1f40cf61dc3451
Parents: b41f4f0 b5cb42f
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Dec 10 10:41:47 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Dec 10 10:41:47 2018 +0000
----------------------------------------------------------------------
.../org/apache/openejb/junit/OpenEjbRunner.java | 1 +
examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +-
.../connector/starter/api/SampleConnection.java | 26 ----
.../starter/api/SampleConnectionFactory.java | 28 ----
.../adapter/SampleConnectionFactoryImpl.java | 69 ---------
.../starter/adapter/SampleConnectionImpl.java | 44 ------
.../adapter/SampleManagedConnection.java | 139 -------------------
.../adapter/SampleManagedConnectionFactory.java | 108 --------------
.../SampleManagedConnectionMetaData.java | 58 --------
.../connector-starter-rar/pom.xml | 43 ------
.../connector-ear-sample/moviefun-ear/pom.xml | 74 ----------
examples/ear-testing/business-logic/pom.xml | 2 +-
examples/ear-testing/business-model/pom.xml | 2 +-
examples/ear-testing/pom.xml | 2 +-
examples/javamail/pom.xml | 2 +-
examples/mp-metrics-counted/pom.xml | 33 ++++-
.../src/main/webapp/WEB-INF/web.xml | 25 ++++
examples/mp-metrics-timed/pom.xml | 37 +++--
.../src/main/webapp/WEB-INF/web.xml | 25 ++++
examples/mvc-cxf/pom.xml | 2 +-
20 files changed, 113 insertions(+), 609 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/22eb8c57/examples/mvc-cxf/pom.xml
----------------------------------------------------------------------