Repository: tomee Updated Branches: refs/heads/master 7293e6655 -> 8a06fbcca
upgrading ejb-example to tomee maven plugin Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8a06fbcc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8a06fbcc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8a06fbcc Branch: refs/heads/master Commit: 8a06fbcca2f1bf09083e2aa02f492e4f70010f20 Parents: 7293e66 Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Fri May 22 12:46:55 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Fri May 22 12:46:55 2015 +0200 ---------------------------------------------------------------------- examples/ejb-examples/pom.xml | 19 +++++-------------- .../src/main/webapp/META-INF/context.xml | 2 +- .../ejb-examples/src/main/webapp/WEB-INF/web.xml | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/8a06fbcc/examples/ejb-examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml index 752200c..840fd10 100644 --- a/examples/ejb-examples/pom.xml +++ b/examples/ejb-examples/pom.xml @@ -54,21 +54,12 @@ </configuration> </plugin> <plugin> - <groupId>com.googlecode.t7mp</groupId> - <artifactId>maven-t7-plugin</artifactId> - <version>0.9.6</version> + <groupId>org.apache.tomee.maven</groupId> + <artifactId>tomee-maven-plugin</artifactId> + <version>7.0.0-SNAPSHOT</version> <configuration> - <tomcatHttpPort>9999</tomcatHttpPort> - <tomcatShutdownPort>9998</tomcatShutdownPort> - <tomcatVersion>7.0.27</tomcatVersion> - <webapps> - <webappArtifact> - <groupId>org.apache.tomee</groupId> - <artifactId>openejb-tomcat-webapp</artifactId> - <version>7.0.0-SNAPSHOT</version> - <contextPath>openejb</contextPath> - </webappArtifact> - </webapps> + <context>/ejb-examples</context> + <tomeeClassifier>plus</tomeeClassifier> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/tomee/blob/8a06fbcc/examples/ejb-examples/src/main/webapp/META-INF/context.xml ---------------------------------------------------------------------- diff --git a/examples/ejb-examples/src/main/webapp/META-INF/context.xml b/examples/ejb-examples/src/main/webapp/META-INF/context.xml index bfe42c1..bb5d5a3 100644 --- a/examples/ejb-examples/src/main/webapp/META-INF/context.xml +++ b/examples/ejb-examples/src/main/webapp/META-INF/context.xml @@ -22,7 +22,7 @@ <Context> <!-- This only works if the context is installed under the correct name --> <Realm className="org.apache.catalina.realm.MemoryRealm" - pathname="webapps/ejb-examples-1.0-SNAPSHOT/WEB-INF/tomcat-users.xml"/> + pathname="webapps/ejb-examples/WEB-INF/tomcat-users.xml"/> <Environment name="context.xml/environment" http://git-wip-us.apache.org/repos/asf/tomee/blob/8a06fbcc/examples/ejb-examples/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/examples/ejb-examples/src/main/webapp/WEB-INF/web.xml b/examples/ejb-examples/src/main/webapp/WEB-INF/web.xml index 70425d0..86ce52e 100644 --- a/examples/ejb-examples/src/main/webapp/WEB-INF/web.xml +++ b/examples/ejb-examples/src/main/webapp/WEB-INF/web.xml @@ -161,6 +161,6 @@ <persistence-context-ref> <persistence-context-ref-name>web.xml/PersistenceContext</persistence-context-ref-name> <persistence-unit-name>jpa-example</persistence-unit-name> - <persistence-context-type>Transactional</persistence-context-type> + <persistence-context-type>Transaction</persistence-context-type> </persistence-context-ref> </web-app>