[picocontainer-scm] [5678] java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp: Removed dependency on JDO datanucleus

Revision 5678
Author mauro
Date 2010-04-15 08:46:04 -0500 (Thu, 15 Apr 2010)

Log Message

Removed dependency on JDO datanucleus

Modified Paths

- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/pom.xml

- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/AjaxEmailWebappComposer.java

- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/persistence/JdoPersister.java

- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/test/org/picocontainer/web/sample/ajaxemail/scenarios/steps/AjaxEmailScenario.java

Diff

Modified: java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/pom.xml (5677 => 5678)

--- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/pom.xml 2010-04-14 23:48:57 UTC (rev 5677)
+++ java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/pom.xml 2010-04-15 13:46:04 UTC (rev 5678)
@@ -27,17 +27,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>transaction-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
<version>2.3-ea</version>
@@ -190,56 +179,8 @@
</webResources>
</configuration>
</plugin>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>maven-datanucleus-plugin</artifactId>
- <version>1.1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>transaction-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-rdbms</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>transaction-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <configuration>
- <mappingIncludes>**/*.jdo, **/*.class</mappingIncludes>
- <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
- <verbose>true</verbose>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
-
<profiles>
<profile>
<id>skip-scenarios</id>

Modified: java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/AjaxEmailWebappComposer.java (5677 => 5678)

--- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/AjaxEmailWebappComposer.java 2010-04-14 23:48:57 UTC (rev 5677)
+++ java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/AjaxEmailWebappComposer.java 2010-04-15 13:46:04 UTC (rev 5678)
@@ -6,10 +6,8 @@

import org.picocontainer.MutablePicoContainer;
import org.picocontainer.web.WebappComposer;
-//import org.picocontainer.web.caching.FallbackCacheProvider;
import org.picocontainer.web.remoting.PicoWebRemotingMonitor;
import org.picocontainer.web.sample.ajaxemail.persistence.InMemoryPersister;
-import org.picocontainer.web.sample.ajaxemail.persistence.JdoPersister;
import org.picocontainer.web.sample.ajaxemail.persistence.Persister;

public class AjaxEmailWebappComposer implements WebappComposer {
@@ -17,7 +15,7 @@
public void composeApplication(MutablePicoContainer container, ServletContext context) {
container.addComponent(PicoWebRemotingMonitor.class, AjaxEmailWebRemotingMonitor.class);
container.addComponent(UserStore.class);
- container.addComponent(Persister.class, getPersisterClass());
+ container.addComponent(Persister.class, InMemoryPersister.class);
container.addComponent(QueryStore.class);
// container.addAdapter(new FallbackCacheProvider());
}
@@ -36,27 +34,4 @@

}

- /**
- * Some ugliness to determine if the user is deploying the app via "maven jetty:run-war"
- * @return
- */
- private Class<? extends Persister> getPersisterClass() {
- boolean isMaven = false;
- try {
- throw new RuntimeException();
- } catch (RuntimeException re) {
- for (StackTraceElement ste : re.getStackTrace()) {
- if (ste.getClassName().contains("maven")) {
- isMaven = true;
- }
- }
- }
- if (isMaven) {
- return InMemoryPersister.class;
- } else {
- return JdoPersister.class;
- }
-
- }
-
}

Modified: java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/persistence/JdoPersister.java (5677 => 5678)

--- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/persistence/JdoPersister.java 2010-04-14 23:48:57 UTC (rev 5677)
+++ java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/java/org/picocontainer/web/sample/ajaxemail/persistence/JdoPersister.java 2010-04-15 13:46:04 UTC (rev 5678)
@@ -7,31 +7,6 @@

public class JdoPersister implements Persister {

-// public static interface GoogleServices {
-// <T> T getService(Class<T> clazz);
-// <T> T getService(Class<T> clazz, String hint);
-// }
-//
-// public static class FooServlet extends HttpServlet {
-//
-// private final PersistenceManager pm;
-//
-// /** GAE fills this in */
-// public FooServlet(GoogleServices services) {
-// this.pm = services.getService(PersistenceManager.class,
-// "transactional");
-// }
-//
-// /** But let us also stay compatible with non AppEngine servers */
-// public FooServlet() {
-// this.pm = JDOHelper.getPersistenceManagerFactory("transactional")
-// .getPersistenceManager();
-// }
-//
-// protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
-// }
-// }
-
PersistenceManager pm = JDOHelper.getPersistenceManagerFactory("transactional").getPersistenceManager();

public void makePersistent(Object persistent) {

Modified: java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/test/org/picocontainer/web/sample/ajaxemail/scenarios/steps/AjaxEmailScenario.java (5677 => 5678)

--- java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/test/org/picocontainer/web/sample/ajaxemail/scenarios/steps/AjaxEmailScenario.java 2010-04-14 23:48:57 UTC (rev 5677)
+++ java/2.x/trunk/web/examples/ajax-email/ajax-email-webapp/src/test/org/picocontainer/web/sample/ajaxemail/scenarios/steps/AjaxEmailScenario.java 2010-04-15 13:46:04 UTC (rev 5678)
@@ -15,7 +15,7 @@

public class AjaxEmailScenario extends JUnitScenario {

- private Selenium selenium = new DefaultSelenium("localhost", 4444, "*firefox", "http://localhost:8080");
+ private Selenium selenium = new DefaultSelenium("localhost", 4444, "*safari", "http://localhost:8080");
private AjaxEmailSteps ajaxEmailSteps;

public AjaxEmailScenario() {

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email