Author: buildbot
Date: Sun Jan 22 19:48:18 2012
New Revision: 803048
Log:
Staging update by buildbot for openejb
Modified:
websites/staging/openejb/trunk/content/examples-trunk/cdi-events/pom.xml
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/pom.xml
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
websites/staging/openejb/trunk/content/examples-trunk/spring-integration/pom.xml
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/README.html
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java
websites/staging/openejb/trunk/content/examples-trunk/webapps/ejb-examples/README.html
websites/staging/openejb/trunk/content/examples-trunk/webapps/moviefun/monitor/pom.xml
websites/staging/openejb/trunk/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example-with-application/pom.xml
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example/pom.xml
Modified:
websites/staging/openejb/trunk/content/examples-trunk/cdi-events/pom.xml
==============================================================================
--- websites/staging/openejb/trunk/content/examples-trunk/cdi-events/pom.xml
(original)
+++ websites/staging/openejb/trunk/content/examples-trunk/cdi-events/pom.xml
Sun Jan 22 19:48:18 2012
@@ -76,7 +76,7 @@
<!-- to show events we log them in the test -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-jdk14</artifactId>
<version>1.6.1</version>
<scope>test</scope>
</dependency>
@@ -86,12 +86,6 @@
<version>1.6.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<!--
This section allows you to configure where to publish libraries for sharing.
Modified:
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/pom.xml
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/pom.xml
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/pom.xml
Sun Jan 22 19:48:18 2012
@@ -74,6 +74,12 @@
<version>4.0.0-beta-2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--
This section allows you to configure where to publish libraries for sharing.
Modified:
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
Sun Jan 22 19:48:18 2012
@@ -17,9 +17,6 @@
package org.superbiz.reloadable.pu;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.varia.NullAppender;
import org.apache.openjpa.persistence.StoreCacheImpl;
import org.junit.AfterClass;
import org.junit.Before;
@@ -36,7 +33,6 @@ import javax.naming.NamingException;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
import java.lang.management.ManagementFactory;
-import java.util.Properties;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
@@ -55,25 +51,7 @@ public class CacheActivationTest {
@BeforeClass
public static void start() {
- // customizing logs to print mainly sql queries
- Properties p = new Properties();
- p.put("openejb.nobanner", "false");
- p.put("log4j.rootLogger", "error, N");
- p.put("log4j.category.OpenEJB.options", "error");
- p.put("log4j.category.OpenEJB.options", "error");
- p.put("log4j.category.OpenEJB.server", "error");
- p.put("log4j.category.OpenEJB.startup", "error");
- p.put("log4j.category.OpenEJB.startup.service", "error");
- p.put("log4j.category.OpenEJB.startup.config", "error");
- p.put("log4j.category.openjpa.jdbc.SQL", "debug, C"); // we want sql
queries
- p.put("log4j.category.openjpa.Enhance", "error");
- p.put("log4j.category.org.superbiz", "info, C"); // we want our own
logs
- p.put("log4j.appender.N", NullAppender.class.getName());
- p.put("log4j.appender.C", ConsoleAppender.class.getName());
- p.put("log4j.appender.C.layout", SimpleLayout.class.getName());
-
- // finally starting the container
- container = EJBContainer.createEJBContainer(p);
+ container = EJBContainer.createEJBContainer();
}
@Before
Modified:
websites/staging/openejb/trunk/content/examples-trunk/spring-integration/pom.xml
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/spring-integration/pom.xml
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/spring-integration/pom.xml
Sun Jan 22 19:48:18 2012
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<!-- $Rev: 1180962 $ $Date: 2011-10-10 13:47:49 +0000 (Mon, 10 Oct 2011) $ -->
+<!-- $Rev: 1234582 $ $Date: 2012-01-22 19:47:26 +0000 (Sun, 22 Jan 2012) $ -->
<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/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -78,12 +78,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core-hibernate</artifactId>
<version>4.0.0-beta-2-SNAPSHOT</version>
Modified:
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/README.html
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/README.html
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/README.html
Sun Jan 22 19:48:18 2012
@@ -236,10 +236,6 @@ public class MoviesTest extends TestCase
// overriding has been applied.
p.put("log4j.category.OpenEJB.startup.service", "debug");
- // Want timestamps in the log output?
- p.put("log4j.appender.C.layout", "org.apache.log4j.PatternLayout");
- p.put("log4j.appender.C.layout.ConversionPattern", "%d - %-5p - %m%n");
-
// Will output a generated ejb-jar.xml file that represents
// 100% of the annotations used in the code. This is a great
// way to figure out how to do something in xml for overriding
Modified:
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/troubleshooting/src/test/java/org/superbiz/troubleshooting/MoviesTest.java
Sun Jan 22 19:48:18 2012
@@ -59,10 +59,6 @@ public class MoviesTest extends TestCase
// overriding has been applied.
p.put("log4j.category.OpenEJB.startup.service", "debug");
- // Want timestamps in the log output?
- p.put("log4j.appender.C.layout", "org.apache.log4j.PatternLayout");
- p.put("log4j.appender.C.layout.ConversionPattern", "%d - %-5p - %m%n");
-
// Will output a generated ejb-jar.xml file that represents
// 100% of the annotations used in the code. This is a great
// way to figure out how to do something in xml for overriding
Modified:
websites/staging/openejb/trunk/content/examples-trunk/webapps/ejb-examples/README.html
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/webapps/ejb-examples/README.html
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/webapps/ejb-examples/README.html
Sun Jan 22 19:48:18 2012
@@ -895,23 +895,6 @@ public class WebserviceServlet extends H
}
</code></pre>
-<h2>log4j.xml</h2>
-
-<pre><code><log4j:configuration
xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
- </layout>
- </appender>
-
- <root>
- <priority value="debug"/>
- <appender-ref ref="console"/>
- </root>
-</log4j:configuration>
-</code></pre>
-
<h2>persistence.xml</h2>
<pre><code><persistence xmlns="http://java.sun.com/xml/ns/persistence";
version="1.0">
Modified:
websites/staging/openejb/trunk/content/examples-trunk/webapps/moviefun/monitor/pom.xml
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/webapps/moviefun/monitor/pom.xml
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/webapps/moviefun/monitor/pom.xml
Sun Jan 22 19:48:18 2012
@@ -128,10 +128,6 @@
<artifactId>apacheds-core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>nlog4j</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</exclusion>
Modified:
websites/staging/openejb/trunk/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/webapps/resources-declared-in-webapp/pom.xml
Sun Jan 22 19:48:18 2012
@@ -76,13 +76,6 @@
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
<tomcatVersion>7.0.21</tomcatVersion>
- <libs>
- <jarArtifact>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-logging</artifactId>
- <version>${openejb.version}</version>
- </jarArtifact>
- </libs>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Modified:
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example-with-application/pom.xml
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example-with-application/pom.xml
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example-with-application/pom.xml
Sun Jan 22 19:48:18 2012
@@ -73,13 +73,6 @@
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
<tomcatVersion>7.0.21</tomcatVersion>
- <libs>
- <jarArtifact>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-logging</artifactId>
- <version>${openejb.version}</version>
- </jarArtifact>
- </libs>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
Modified:
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example/pom.xml
==============================================================================
---
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example/pom.xml
(original)
+++
websites/staging/openejb/trunk/content/examples-trunk/webapps/rest-example/pom.xml
Sun Jan 22 19:48:18 2012
@@ -74,13 +74,6 @@
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
<tomcatVersion>7.0.21</tomcatVersion>
- <libs>
- <jarArtifact>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-logging</artifactId>
- <version>${openejb.version}</version>
- </jarArtifact>
- </libs>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
