You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/30 18:39:15 UTC
svn commit: r1332282 - in /openejb/trunk/openejb/examples: ./
datasource-definition/ datasource-definition/src/
datasource-definition/src/main/ datasource-definition/src/main/java/
datasource-definition/src/main/java/org/ datasource-definition/src/main...
Author: rmannibucau
Date: Mon Apr 30 16:39:14 2012
New Revision: 1332282
URL: http://svn.apache.org/viewvc?rev=1332282&view=rev
Log:
adding datasourcedefinition example
Added:
openejb/trunk/openejb/examples/datasource-definition/
openejb/trunk/openejb/examples/datasource-definition/datasource-definition.iml
openejb/trunk/openejb/examples/datasource-definition/pom.xml
openejb/trunk/openejb/examples/datasource-definition/src/
openejb/trunk/openejb/examples/datasource-definition/src/main/
openejb/trunk/openejb/examples/datasource-definition/src/main/java/
openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/
openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/superbiz/
openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/superbiz/dsdef/
openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java
openejb/trunk/openejb/examples/datasource-definition/src/main/resources/
openejb/trunk/openejb/examples/datasource-definition/src/main/resources/META-INF/
openejb/trunk/openejb/examples/datasource-definition/src/main/resources/META-INF/beans.xml
openejb/trunk/openejb/examples/datasource-definition/src/test/
openejb/trunk/openejb/examples/datasource-definition/src/test/java/
openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/
openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/superbiz/
openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/superbiz/dsdef/
openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java
Modified:
openejb/trunk/openejb/examples/pom.xml
Added: openejb/trunk/openejb/examples/datasource-definition/datasource-definition.iml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/datasource-definition/datasource-definition.iml?rev=1332282&view=auto
==============================================================================
--- openejb/trunk/openejb/examples/datasource-definition/datasource-definition.iml (added)
+++ openejb/trunk/openejb/examples/datasource-definition/datasource-definition.iml Mon Apr 30 16:39:14 2012
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.openejb:javaee-api:6.0-3" level="project" />
+ <orderEntry type="library" name="Maven: com.h2database:h2:1.3.166" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
+ <orderEntry type="module" module-name="openejb-core" scope="TEST" />
+ <orderEntry type="module" module-name="mbean-annotation-api" scope="TEST" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
+ <orderEntry type="module" module-name="openejb-api" scope="TEST" />
+ <orderEntry type="module" module-name="openejb-loader" scope="TEST" />
+ <orderEntry type="module" module-name="openejb-javaagent" scope="TEST" />
+ <orderEntry type="module" module-name="openejb-jee" scope="TEST" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:kahadb:5.6-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.6.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-ra:5.6-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-core:5.6-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-net:commons-net:2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.components:geronimo-connector:3.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.components:geronimo-transaction:3.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-connector_1.6_spec:1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.objectweb.howl:howl:1.0.1-1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.javamail:geronimo-javamail_1.4_mail:1.8.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.xbean:xbean-asm-shaded:3.11-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.xbean:xbean-finder-shaded:3.11-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.xbean:xbean-reflect:3.11-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.xbean:xbean-naming:3.11-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.xbean:xbean-bundleutils:3.11-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hsqldb:hsqldb:2.2.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-pool:commons-pool:1.5.7" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.swizzle:swizzle-stream:1.6.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: wsdl4j:wsdl4j:1.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.quartz-scheduler:quartz:2.1.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.6.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.openwebbeans:openwebbeans-impl:1.1.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: net.sf.scannotation:scannotation:1.0.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.openwebbeans:openwebbeans-spi:1.1.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.openwebbeans:openwebbeans-ejb:1.1.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.openwebbeans:openwebbeans-ee:1.1.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.openwebbeans:openwebbeans-ee-common:1.1.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.openwebbeans:openwebbeans-web:1.1.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.javassist:javassist:3.15.0-GA" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.openjpa:openjpa:2.2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: net.sourceforge.serp:serp:1.13.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: asm:asm:3.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.bval:bval-core:0.4-incubating-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-beanutils:commons-beanutils-core:1.8.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.bval:bval-jsr303:0.4-incubating-SNAPSHOT" level="project" />
+ </component>
+</module>
+
Added: openejb/trunk/openejb/examples/datasource-definition/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/datasource-definition/pom.xml?rev=1332282&view=auto
==============================================================================
--- openejb/trunk/openejb/examples/datasource-definition/pom.xml (added)
+++ openejb/trunk/openejb/examples/datasource-definition/pom.xml Mon Apr 30 16:39:14 2012
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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>datasource-definition</artifactId>
+ <packaging>war</packaging>
+ <version>1.1-SNAPSHOT</version>
+ <name>OpenEJB :: Examples :: Datasource Definition</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <openejb.version>4.0.0-beta-3-SNAPSHOT</openejb.version>
+ </properties>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.3.166</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ The <scope>test</scope> guarantees that non of your runtime
+ code is dependent on any OpenEJB classes.
+ -->
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
+ <scope>test</scope>
+ </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>
+</project>
Added: openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java?rev=1332282&view=auto
==============================================================================
--- openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java (added)
+++ openejb/trunk/openejb/examples/datasource-definition/src/main/java/org/superbiz/dsdef/Persister.java Mon Apr 30 16:39:14 2012
@@ -0,0 +1,23 @@
+package org.superbiz.dsdef;
+
+import javax.annotation.Resource;
+import javax.annotation.sql.DataSourceDefinition;
+import javax.sql.DataSource;
+
+@DataSourceDefinition(transactional = true,
+ url = "jdbc:h2:mem:persister",
+ className = "org.h2.jdbcx.JdbcDataSource",
+ user = "sa",
+ password = "",
+ name = "java:app/jdbc/persister",
+ initialPoolSize = 1,
+ maxPoolSize = 3
+)
+public class Persister {
+ @Resource
+ private DataSource ds;
+
+ public DataSource getDs() {
+ return ds;
+ }
+}
Added: openejb/trunk/openejb/examples/datasource-definition/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/datasource-definition/src/main/resources/META-INF/beans.xml?rev=1332282&view=auto
==============================================================================
(empty)
Added: openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java?rev=1332282&view=auto
==============================================================================
--- openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java (added)
+++ openejb/trunk/openejb/examples/datasource-definition/src/test/java/org/superbiz/dsdef/DataSourceDefinitionTest.java Mon Apr 30 16:39:14 2012
@@ -0,0 +1,81 @@
+package org.superbiz.dsdef;
+
+import org.apache.openejb.resource.jdbc.DataSourceFactory;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.inject.Inject;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import java.sql.*;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.*;
+
+public class DataSourceDefinitionTest {
+ private static EJBContainer container;
+
+ @Inject
+ private Persister persister;
+
+ @BeforeClass
+ public static void start() {
+ container = EJBContainer.createEJBContainer();
+ }
+
+ @Before
+ public void inject() throws NamingException {
+ container.getContext().bind("inject", this);
+ }
+
+ @AfterClass
+ public static void stop() {
+ container.close();
+ }
+
+ @Test
+ public void checkDs() throws SQLException {
+ final DataSource ds = persister.getDs();
+ assertNotNull(ds);
+ assertThat(ds, instanceOf(DataSourceFactory.DbcpManagedDataSource.class));
+
+ final DataSourceFactory.DbcpManagedDataSource castedDs = (DataSourceFactory.DbcpManagedDataSource) ds;
+
+ final String driver = castedDs.getDriverClassName();
+ assertNull(null, driver);
+
+ final String user = castedDs.getUserName();
+ assertEquals("sa", user);
+
+ final String url = castedDs.getUrl();
+ assertEquals("jdbc:h2:mem:persister", url);
+
+ final int initPoolSize = castedDs.getInitialSize();
+ assertEquals(1, initPoolSize);
+
+ final int maxIdle = castedDs.getMaxIdle();
+ assertEquals(3, maxIdle);
+
+ final Connection connection = ds.getConnection();
+ assertNotNull(connection);
+
+ execute(connection, "CREATE TABLE TEST(ID INT PRIMARY KEY, NAME VARCHAR(255))");
+ execute(connection, "INSERT INTO TEST(ID, NAME) VALUES(1, 'foo')");
+ connection.commit();
+
+ final PreparedStatement statement = ds.getConnection().prepareStatement("SELECT NAME FROM TEST");
+ statement.execute();
+ final ResultSet set = statement.getResultSet();
+
+ assertTrue(set.next());
+ assertEquals("foo", set.getString("NAME"));
+ }
+
+ private void execute(final Connection connection, final String sql) throws SQLException {
+ connection.prepareStatement(sql).execute();
+ }
+}
Modified: openejb/trunk/openejb/examples/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/pom.xml?rev=1332282&r1=1332281&r2=1332282&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/pom.xml (original)
+++ openejb/trunk/openejb/examples/pom.xml Mon Apr 30 16:39:14 2012
@@ -105,6 +105,7 @@
<module>webservice-ws-security</module>
<module>webservice-handlerchain</module>
<module>webservice-holder</module>
+ <module>datasource-definition</module>
</modules>
<profiles>
<profile>