You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/04/16 19:51:14 UTC
svn commit: r1587995 - in /tomee/tomee/trunk/examples:
datasource-versioning/src/main/tomee/conf/
datasource-versioning/src/main/webapp/
datasource-versioning/src/main/webapp/WEB-INF/
datasource-versioning/src/test/conf/ datasource-versioning/src/test/...
Author: andygumbrecht
Date: Wed Apr 16 17:51:13 2014
New Revision: 1587995
URL: http://svn.apache.org/r1587995
Log:
Still trying to get arquillian datasources - In progress
Added:
tomee/tomee/trunk/examples/datasource-versioning/src/test/conf/
- copied from r1587952, tomee/tomee/trunk/examples/datasource-versioning/src/main/tomee/conf/
tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/META-INF/resources.xml
Removed:
tomee/tomee/trunk/examples/datasource-versioning/src/main/tomee/conf/
Modified:
tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/WEB-INF/web.xml
tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/index.jsp
tomee/tomee/trunk/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/arquillian.xml
tomee/tomee/trunk/examples/moviefun-rest/ (props changed)
tomee/tomee/trunk/examples/realm-in-tomee/pom.xml
Modified: tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/WEB-INF/web.xml?rev=1587995&r1=1587994&r2=1587995&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/WEB-INF/web.xml (original)
+++ tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/WEB-INF/web.xml Wed Apr 16 17:51:13 2014
@@ -21,22 +21,4 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
- <security-constraint>
- <display-name>Realm In TomEE</display-name>
- <web-resource-collection>
- <web-resource-name>Secured</web-resource-name>
- <url-pattern>/index.jsp</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>admin</role-name>
- </auth-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>Admin space</realm-name>
- </login-config>
- <security-role>
- <description>Admin</description>
- <role-name>admin</role-name>
- </security-role>
</web-app>
Modified: tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/index.jsp?rev=1587995&r1=1587994&r2=1587995&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/index.jsp (original)
+++ tomee/tomee/trunk/examples/datasource-versioning/src/main/webapp/index.jsp Wed Apr 16 17:51:13 2014
@@ -18,7 +18,7 @@ limitations under the License.
-->
<html>
<head>
- <title>Realm In TomEE</title>
+ <title>Just an empty page for now</title>
</head>
<body>
<h1>Home</h1>
Modified: tomee/tomee/trunk/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java?rev=1587995&r1=1587994&r2=1587995&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java (original)
+++ tomee/tomee/trunk/examples/datasource-versioning/src/test/java/org/superbiz/AlternateDataSourceTest.java Wed Apr 16 17:51:13 2014
@@ -34,6 +34,7 @@ public class AlternateDataSourceTest {
return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(DataSourceTester.class)
.addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml");
+ //.addAsResource(new ClassLoaderAsset("META-INF/resources.xml"), "META-INF/resources.xml");
//.addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml");
}
@@ -52,7 +53,7 @@ public class AlternateDataSourceTest {
@Resource(name = "DatabaseOne")
DataSource dataSourceOne;
- @Resource(name = "DatabaseOne")
+ @Resource(name = "DatabaseTwo")
DataSource dataSourceTwo;
public String getOne() throws Exception {
Added: tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/META-INF/resources.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/META-INF/resources.xml?rev=1587995&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/META-INF/resources.xml (added)
+++ tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/META-INF/resources.xml Wed Apr 16 17:51:13 2014
@@ -0,0 +1,15 @@
+<resources>
+
+ <Resource id="DatabaseOne" type="DataSource" classpath="target/drivers/derby-10.10.1.1.jar">
+ JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+ JdbcUrl jdbc:derby:databaseOne;create=true
+ UserName SA
+ </Resource>
+
+ <Resource id="DatabaseTwo" type="DataSource" classpath="target/drivers/derby-10.9.1.0.jar">
+ JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+ JdbcUrl jdbc:derby:databaseTwo;create=true
+ UserName SA
+ </Resource>
+
+</resources>
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/arquillian.xml?rev=1587995&r1=1587994&r2=1587995&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/arquillian.xml (original)
+++ tomee/tomee/trunk/examples/datasource-versioning/src/test/resources/arquillian.xml Wed Apr 16 17:51:13 2014
@@ -22,10 +22,9 @@
<container qualifier="tomee" default="true">
<configuration>
+ <property name="serverXml">../src/test/conf/tomee.xml</property>
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
- <property name="tomcatVersion"></property>
- <property name="openejbVersion">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote</property>
<property name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>
Propchange: tomee/tomee/trunk/examples/moviefun-rest/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 16 17:51:13 2014
@@ -1,2 +1,3 @@
target
*.iml
+.idea
Modified: tomee/tomee/trunk/examples/realm-in-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/realm-in-tomee/pom.xml?rev=1587995&r1=1587994&r2=1587995&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/realm-in-tomee/pom.xml (original)
+++ tomee/tomee/trunk/examples/realm-in-tomee/pom.xml Wed Apr 16 17:51:13 2014
@@ -31,8 +31,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>