You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/01/30 20:16:01 UTC
svn commit: r803586 - in /websites/production/openejb: ./
content/examples-trunk/ content/examples-trunk/cdi-application-scope/
content/examples-trunk/cdi-request-scope/
content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/
Author: dblevins
Date: Mon Jan 30 19:16:01 2012
New Revision: 803586
Log:
Publishing merge to openejb site by dblevins
Modified:
websites/production/openejb/ (props changed)
websites/production/openejb/content/examples-trunk/cdi-application-scope/pom.xml
websites/production/openejb/content/examples-trunk/cdi-request-scope/pom.xml
websites/production/openejb/content/examples-trunk/index.html
websites/production/openejb/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
Propchange: websites/production/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 30 19:16:01 2012
@@ -1 +1 @@
-/websites/staging/openejb/trunk:790824-803543
+/websites/staging/openejb/trunk:790824-803583
Modified: websites/production/openejb/content/examples-trunk/cdi-application-scope/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/cdi-application-scope/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/cdi-application-scope/pom.xml Mon Jan 30 19:16:01 2012
@@ -50,4 +50,21 @@
<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>
Modified: websites/production/openejb/content/examples-trunk/cdi-request-scope/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/cdi-request-scope/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/cdi-request-scope/pom.xml Mon Jan 30 19:16:01 2012
@@ -50,4 +50,21 @@
<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>
Modified: websites/production/openejb/content/examples-trunk/index.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/index.html (original)
+++ websites/production/openejb/content/examples-trunk/index.html Mon Jan 30 19:16:01 2012
@@ -112,8 +112,8 @@
<ul>
<li><a href="cdi-basic/README.html">cdi-basic</a></li>
-<li><a href="cdi-request-scoped/README.html">cdi-request-scoped</a></li>
-<li><a href="cdi-application-scoped/README.html">cdi-application-scoped</a></li>
+<li><a href="cdi-request-scope/README.html">cdi-request-scope</a></li>
+<li><a href="cdi-application-scope/README.html">cdi-application-scope</a></li>
<li><a href="cdi-interceptors/README.html">cdi-interceptors</a></li>
<li><a href="cdi-produces-disposes/README.html">cdi-produces-disposes</a></li>
<li><a href="decorators/README.html">decorators</a></li>
Modified: websites/production/openejb/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
==============================================================================
--- websites/production/openejb/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java (original)
+++ websites/production/openejb/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java Mon Jan 30 19:16:01 2012
@@ -106,7 +106,7 @@ public class UserServiceTest {
.path("/user/list")
.get(String.class);
assertEquals(
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ inline("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<users>" +
" <user>" +
" <email>foo@foo.com</email>" +
@@ -120,7 +120,12 @@ public class UserServiceTest {
" <id>2</id>" +
" <password>barpwd</password>" +
" </user>" +
- "</users>", users);
+ "</users>"), inline(users));
+ }
+
+ private static String inline(String s) {
+ return s.replace(System.getProperty("line.separator"), "").replace("\n", "")
+ .replace(" ", "").replace("\t", "");
}
@Test