You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/01/30 11:19:38 UTC
svn commit: r1440332 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi: ./
src/main/java/org/apache/myfaces/tobago/example/addressbook/
src/main/webapp/WEB-INF/
Author: lofwyr
Date: Wed Jan 30 10:19:37 2013
New Revision: 1440332
URL: http://svn.apache.org/viewvc?rev=1440332&view=rev
Log:
addressbook with CDI
- spring removed
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/OpenJpaLoadTimeWeaver.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml?rev=1440332&r1=1440331&r2=1440332&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml Wed Jan 30 10:19:37 2013
@@ -29,7 +29,6 @@
<properties>
<openjpa.version>1.0.4</openjpa.version>
- <spring.version>2.5.3</spring.version>
<openwebbeans.version>1.1.6</openwebbeans.version>
<myfaces-extcdi.version>1.0.5</myfaces-extcdi.version>
</properties>
@@ -315,26 +314,6 @@
<version>10.3.1.4</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<exclusions>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java?rev=1440332&r1=1440331&r2=1440332&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/DerbyShutdownServletContextListener.java Wed Jan 30 10:19:37 2013
@@ -39,6 +39,8 @@ public class DerbyShutdownServletContext
}
+ // todo: should not be shutted down in case of the "InMemoryAddressDao" alternative
+
public void contextDestroyed(ServletContextEvent servletContextEvent) {
try {
DriverManager.getConnection("jdbc:derby:target/addressDB;shutdown=true");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java?rev=1440332&r1=1440331&r2=1440332&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java Wed Jan 30 10:19:37 2013
@@ -21,7 +21,7 @@ package org.apache.myfaces.tobago.exampl
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.transaction.annotation.Transactional;
+//import org.springframework.transaction.annotation.Transactional;
import javax.annotation.sql.DataSourceDefinition;
import javax.enterprise.context.ApplicationScoped;
@@ -36,7 +36,7 @@ import java.util.List;
url = "jdbc:derby:target/addressDB;create=true",
className = "org.apache.derby.jdbc.EmbeddedDriver"
)
-@Transactional
+//@Transactional
@ApplicationScoped
public class JpaAddressDao implements AddressDao, Serializable {
@@ -57,12 +57,12 @@ public class JpaAddressDao implements Ad
}
return address;
}
- @Transactional(readOnly = true)
+// @Transactional(readOnly = true)
public List<Address> findAddresses(String filter) {
return findAddresses(filter, null, true);
}
- @Transactional(readOnly = true)
+// @Transactional(readOnly = true)
@SuppressWarnings("unchecked")
public List<Address> findAddresses(String filter, String column, boolean order) {
StringBuilder builder = new StringBuilder();
@@ -90,7 +90,7 @@ public class JpaAddressDao implements Ad
address = getAddress(address.getId());
entityManager.remove(address);
}
- @Transactional(readOnly = true)
+// @Transactional(readOnly = true)
public Address getAddress(Integer id) {
return entityManager.find(Address.class, id);
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/OpenJpaLoadTimeWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/OpenJpaLoadTimeWeaver.java?rev=1440332&r1=1440331&r2=1440332&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/OpenJpaLoadTimeWeaver.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/java/org/apache/myfaces/tobago/example/addressbook/OpenJpaLoadTimeWeaver.java Wed Jan 30 10:19:37 2013
@@ -19,8 +19,8 @@
package org.apache.myfaces.tobago.example.addressbook;
-import org.springframework.instrument.classloading.SimpleInstrumentableClassLoader;
-import org.springframework.instrument.classloading.SimpleLoadTimeWeaver;
+//import org.springframework.instrument.classloading.SimpleInstrumentableClassLoader;
+//import org.springframework.instrument.classloading.SimpleLoadTimeWeaver;
/**
@@ -52,6 +52,7 @@ import org.springframework.instrument.cl
* author Marc Prud'hommeaux
* @since 2.0
*/
+/*
public class OpenJpaLoadTimeWeaver extends SimpleLoadTimeWeaver {
public OpenJpaLoadTimeWeaver() {
@@ -66,3 +67,4 @@ public class OpenJpaLoadTimeWeaver exten
excludePackage("org.apache.openjpa");
}
}
+*/
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml?rev=1440332&r1=1440331&r2=1440332&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml Wed Jan 30 10:19:37 2013
@@ -66,22 +66,9 @@
-->
<listener>
- <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <listener>
<listener-class>org.apache.myfaces.tobago.example.addressbook.DerbyShutdownServletContextListener</listener-class>
</listener>
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/applicationContext.xml</param-value>
- </context-param>
-
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>