You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@tomee.apache.org by bu...@apache.org on 2014/05/06 18:04:00 UTC
svn commit: r908203 - in /websites/staging/tomee/trunk: cgi-bin/ content/
content/dev/ content/examples-trunk/change-jaxws-url/
content/examples-trunk/groovy-cdi/ content/examples-trunk/groovy-spock/
content/examples-trunk/lookup-of-ejbs-with-descripto...
Author: buildbot
Date: Tue May 6 16:03:59 2014
New Revision: 908203
Log:
Staging update by buildbot for tomee
Modified:
websites/staging/tomee/trunk/cgi-bin/ (props changed)
websites/staging/tomee/trunk/content/ (props changed)
websites/staging/tomee/trunk/content/dev/release-tomee.html
websites/staging/tomee/trunk/content/documentation.html
websites/staging/tomee/trunk/content/examples-trunk/change-jaxws-url/pom.xml
websites/staging/tomee/trunk/content/examples-trunk/groovy-cdi/pom.xml
websites/staging/tomee/trunk/content/examples-trunk/groovy-spock/pom.xml
websites/staging/tomee/trunk/content/examples-trunk/lookup-of-ejbs-with-descriptor/pom.xml
websites/staging/tomee/trunk/content/examples-trunk/lookup-of-ejbs/pom.xml
websites/staging/tomee/trunk/content/examples-trunk/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java
websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/main/java/org/superbiz/injection/tx/Movies.java
websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java
websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/main/java/org/superbiz/rest/User.java
websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
websites/staging/tomee/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java
websites/staging/tomee/trunk/content/examples-trunk/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java
websites/staging/tomee/trunk/content/examples-trunk/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
websites/staging/tomee/trunk/content/examples-trunk/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java
websites/staging/tomee/trunk/content/examples-trunk/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java
websites/staging/tomee/trunk/content/examples-trunk/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java
websites/staging/tomee/trunk/content/examples-trunk/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
websites/staging/tomee/trunk/content/examples-trunk/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
websites/staging/tomee/trunk/content/examples-trunk/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
websites/staging/tomee/trunk/content/sitemap.html
websites/staging/tomee/trunk/content/understanding-the-directory-layout.html
websites/staging/tomee/trunk/content/weblogic.html
Propchange: websites/staging/tomee/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 6 16:03:59 2014
@@ -1 +1 @@
-1591459
+1592790
Propchange: websites/staging/tomee/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 6 16:03:59 2014
@@ -1 +1 @@
-1591459
+1592790
Modified: websites/staging/tomee/trunk/content/dev/release-tomee.html
==============================================================================
--- websites/staging/tomee/trunk/content/dev/release-tomee.html (original)
+++ websites/staging/tomee/trunk/content/dev/release-tomee.html Tue May 6 16:03:59 2014
@@ -245,7 +245,8 @@ svn delete -m "Delete test dir" https://
<li><a href="http://www.apache.org/dist/openejb/KEYS">http://www.apache.org/dist/openejb/KEYS</a></li>
</ul>
-<p>That is best done as the file itself explains one you view it in a UTF-8 safe text editor.</p>
+<p>That is best done as the file itself explains, once you open and view it in a UTF-8 safe text editor you will see the description at the top. <br />
+Just follow the instructions there on how to append your key. The basic steps are also here, please read both before you proceed:</p>
<ul>
<li>Save the KEYS file on your local machine and import it using <strong>gpg --import KEYS</strong></li>
@@ -295,9 +296,21 @@ svn delete -m "Delete test dir" https://
<h3>Begin The Release Process</h3>
-<p>Ensure TCK is passing all tests.</p>
+<p>Ensure TCK is passing all tests, and if so create an SVN tag from the branch.</p>
-<p>Open a console on the release tools directory.</p>
+<pre><code>Note: It is a future goal to either separate OpenEJB from TomEE or unify the versions so the
+[maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) can be used.
+
+Because we cannot use the Maven release tools we currently have to create a an SVN tag manually. The best way to do this is to:
+
+ - Copy the branch to a staging branch using: svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version] https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Staging [version]"
+ - Checkout the staging branch using: svn co https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging tomee-[version]-staging
+ - Update all SNAPSHOT versions to the release versions in the local tomee-[version]-staging and commit.
+ - Create the tag from the staging: svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging https://svn.apache.org/repos/asf/tomee/tomee/tags/tomee-[version] -m "Tag [version]"
+ - Delete the staging branch using: svn rm https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Delete staging"
+</code></pre>
+
+<p>Open a console on the release-tools directory.</p>
<p>Note: Before running any <strong>./run.sh</strong> activity always check the release tools code for the command tomee-release-tools/src/main/java/org/apache/openejb/tools/release/cmd.
At the moment some of the commands need manually editing to work. Eventually the commands should be re-written.</p>
@@ -308,7 +321,7 @@ At the moment some of the commands need
<p>Ensure JIRAs have been filed for commits using <strong>./run.sh reviewcommits</strong></p>
-<p>Update fixVersions for JIRAs used in SVN commits using <strong>./run.sh updatejiras</strong></p>
+<p>Update fixVersions for JIRAs used in SVN commits using <strong>./run.sh updatejiras</strong> - <em>Untested, requires investigation</em></p>
<p>Review and bulk Close all JIRAs for the version to be released.</p>
@@ -326,13 +339,6 @@ At the moment some of the commands need
<p>Create the next version iterations in JIRA.</p>
-<p>Resolve all SNAPSHOT dependencies in the branch against release versions. This includes the modules themselves.
-The reason for this is that an SVN TAG is taken straight off the branch during the next step.</p>
-
-<pre><code>Note: It is a future goal to either separate OpenEJB from TomEE or unify the versions so the
-[maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) can be used.
-</code></pre>
-
<h3>Rolling Out The Preview</h3>
<p>Publish the preview using <strong>./run.sh roll binaries legal releasenotes preview</strong> - You can run these tasks like so, or individually in order.
Modified: websites/staging/tomee/trunk/content/documentation.html
==============================================================================
--- websites/staging/tomee/trunk/content/documentation.html (original)
+++ websites/staging/tomee/trunk/content/documentation.html Tue May 6 16:03:59 2014
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>Index</title>
+ <title>Documentation</title>
<meta name="description" content="">
<meta name="author" content="">
@@ -33,7 +33,7 @@
};
function twshare () {
window.open(
- "https://twitter.com/intent/tweet?url="+document.URL+"&text=Index",
+ "https://twitter.com/intent/tweet?url="+document.URL+"&text=Documentation",
'Share on Twitter',
'width=800,height=526');
};
@@ -117,7 +117,7 @@
<div class="page-header">
<small><a href="./index.html">Home</a></small><br>
- <h1>Index
+ <h1>Documentation
<div style="float: right; position: relative; bottom: -10px; ">
<a onclick="javascript:gpshare()" class="gp-share sprite" title="share on Google+">share [gp]</a>
@@ -128,7 +128,8 @@
</h1>
</div>
-<p>See also the <a href="examples-trunk/index.html">examples page</a> for downloadable, executable and code-focused view of Java EE and TomEE.
+<p>See also the <a href="examples-trunk/index.html">examples page</a> for downloadable, executable and code-focused view of Java EE and TomEE. <br />
+You can also find us on IRC freenode.org #openejb
<div class="row">
<div class="span-one-third"></p>
@@ -208,7 +209,7 @@
<p><a href="tomee-mp-getting-started.html">Getting started</a> <br />
<a href="tomee-maven-plugin.html">tomee-maven-plugin reference documentation</a> <br />
-<a href="tomee-mp-getting-started.mdtext.html">TomEE simple webapp archetype documentation</a> </div><div class="span-one-third"></p>
+<a href="tomee-mp-getting-started.html">TomEE simple webapp archetype documentation</a> </div><div class="span-one-third"></p>
<h3>Tips and Tricks</h3>
Modified: websites/staging/tomee/trunk/content/examples-trunk/change-jaxws-url/pom.xml
==============================================================================
Binary files - no diff available.
Modified: websites/staging/tomee/trunk/content/examples-trunk/groovy-cdi/pom.xml
==============================================================================
Binary files - no diff available.
Modified: websites/staging/tomee/trunk/content/examples-trunk/groovy-spock/pom.xml
==============================================================================
Binary files - no diff available.
Modified: websites/staging/tomee/trunk/content/examples-trunk/lookup-of-ejbs-with-descriptor/pom.xml
==============================================================================
Binary files - no diff available.
Modified: websites/staging/tomee/trunk/content/examples-trunk/lookup-of-ejbs/pom.xml
==============================================================================
Binary files - no diff available.
Modified: websites/staging/tomee/trunk/content/examples-trunk/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/movies-complete-meta/src/test/java/org/superbiz/injection/tx/MoviesTest.java Tue May 6 16:03:59 2014
@@ -55,6 +55,19 @@ public class MoviesTest extends TestCase
EJBContainer.createEJBContainer(p).getContext().bind("inject", this);
}
+ @Override
+ protected void tearDown() throws Exception {
+ transactionalCaller.call(new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ for (final Movie m : movies.getMovies()) {
+ movies.deleteMovie(m);
+ }
+ return null;
+ }
+ });
+ }
+
private void doWork() throws Exception {
movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
Modified: websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/main/java/org/superbiz/injection/tx/Movies.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/main/java/org/superbiz/injection/tx/Movies.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/main/java/org/superbiz/injection/tx/Movies.java Tue May 6 16:03:59 2014
@@ -18,6 +18,7 @@ package org.superbiz.injection.tx;
import javax.annotation.security.PermitAll;
import javax.annotation.security.RolesAllowed;
+import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
Modified: websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/movies-complete/src/test/java/org/superbiz/injection/tx/MoviesTest.java Tue May 6 16:03:59 2014
@@ -55,6 +55,19 @@ public class MoviesTest extends TestCase
EJBContainer.createEJBContainer(p).getContext().bind("inject", this);
}
+ @Override
+ protected void tearDown() throws Exception {
+ transactionalCaller.call(new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ for (final Movie m : movies.getMovies()) {
+ movies.deleteMovie(m);
+ }
+ return null;
+ }
+ });
+ }
+
private void doWork() throws Exception {
movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 1992));
Modified: websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/main/java/org/superbiz/rest/User.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/main/java/org/superbiz/rest/User.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/main/java/org/superbiz/rest/User.java Tue May 6 16:03:59 2014
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
@Entity
@NamedQueries({
- @NamedQuery(name = "user.list", query = "select u from User u")
+ @NamedQuery(name = "user.list", query = "select u from User u order by u.fullname")
})
@XmlRootElement(name = "user")
public class User implements Cloneable {
Modified: websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java Tue May 6 16:03:59 2014
@@ -66,11 +66,11 @@ public class UserServiceTest {
public void create() {
int expected = service.list(0, 100).size() + 1;
Response response = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/create")
- .query("name", "dummy")
- .query("pwd", "unbreakable")
- .query("mail", "foo@bar.fr")
- .put(null);
+ .path("/user/create")
+ .query("name", "dummy")
+ .query("pwd", "unbreakable")
+ .query("mail", "foo@bar.fr")
+ .put(null);
List<User> list = service.list(0, 100);
for (User u : list) {
if (!users.contains(u)) {
@@ -94,8 +94,8 @@ public class UserServiceTest {
@Test
public void show() {
User user = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/show/" + users.iterator().next().getId())
- .get(User.class);
+ .path("/user/show/" + users.iterator().next().getId())
+ .get(User.class);
assertEquals("foo", user.getFullname());
assertEquals("foopwd", user.getPassword());
assertEquals("foo@foo.com", user.getEmail());
@@ -104,24 +104,25 @@ public class UserServiceTest {
@Test
public void list() throws Exception {
String users = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/list")
- .get(String.class);
- assertEquals(
- inline("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<users>" +
- " <user>" +
- " <email>foo@foo.com</email>" +
- " <fullname>foo</fullname>" +
- " <id>1</id>" +
- " <password>foopwd</password>" +
- " </user>" +
- " <user>" +
- " <email>bar@bar.com</email>" +
- " <fullname>bar</fullname>" +
- " <id>2</id>" +
- " <password>barpwd</password>" +
- " </user>" +
- "</users>"), inline(users));
+ .path("/user/list")
+ .get(String.class);
+ assertEquals(users,
+ inline("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ "<users>" +
+ " <user>" +
+ " <email>bar@bar.com</email>" +
+ " <fullname>bar</fullname>" +
+ " <id>2</id>" +
+ " <password>barpwd</password>" +
+ " </user>" +
+ " <user>" +
+ " <email>foo@foo.com</email>" +
+ " <fullname>foo</fullname>" +
+ " <id>1</id>" +
+ " <password>foopwd</password>" +
+ " </user>" +
+ "</users>"), inline(users)
+ );
}
private static String inline(String s) {
@@ -133,11 +134,11 @@ public class UserServiceTest {
public void update() throws Exception {
User created = service.create("name", "pwd", "mail");
Response response = WebClient.create("http://localhost:4204/rest-on-ejb")
- .path("/user/update/" + created.getId())
- .query("name", "corrected")
- .query("pwd", "userpwd")
- .query("mail", "it@is.ok")
- .post(null);
+ .path("/user/update/" + created.getId())
+ .query("name", "corrected")
+ .query("pwd", "userpwd")
+ .query("mail", "it@is.ok")
+ .post(null);
JAXBContext ctx = JAXBContext.newInstance(User.class);
Unmarshaller unmarshaller = ctx.createUnmarshaller();
@@ -146,5 +147,6 @@ public class UserServiceTest {
assertEquals("corrected", modified.getFullname());
assertEquals("userpwd", modified.getPassword());
assertEquals("it@is.ok", modified.getEmail());
+ service.delete(created.getId());
}
}
Modified: websites/staging/tomee/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java Tue May 6 16:03:59 2014
@@ -32,11 +32,17 @@ import static org.junit.Assert.assertTru
public class CalculatorTest {
private static EJBContainer container;
+
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
@BeforeClass
public static void setUp() throws Exception {
final Properties properties = new Properties();
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
container = EJBContainer.createEJBContainer(properties);
}
@@ -57,7 +63,7 @@ public class CalculatorTest {
@Test
public void wsdlExists() throws Exception {
- final URL url = new URL("http://127.0.0.1:4204/simple-webservice-without-interface/Calculator?wsdl");
+ final URL url = new URL("http://localhost:" + port + "/simple-webservice-without-interface/Calculator?wsdl");
assertTrue(IOUtils.readLines(url.openStream()).size() > 0);
assertTrue(IOUtils.readLines(url.openStream()).toString().contains("CalculatorWsService"));
}
Modified: websites/staging/tomee/trunk/content/examples-trunk/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/simple-webservice/src/test/java/org/superbiz/calculator/ws/CalculatorTest.java Tue May 6 16:03:59 2014
@@ -30,10 +30,17 @@ import static org.junit.Assert.assertNot
public class CalculatorTest {
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
+
@BeforeClass
public static void setUp() throws Exception {
Properties properties = new Properties();
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
+
// properties.setProperty("httpejbd.print", "true");
// properties.setProperty("httpejbd.indent.xml", "true");
// properties.setProperty("logging.level.OpenEJB.server.http", "FINE");
@@ -43,7 +50,7 @@ public class CalculatorTest {
@Test
public void test() throws Exception {
Service calculatorService = Service.create(
- new URL("http://127.0.0.1:4204/simple-webservice/Calculator?wsdl"),
+ new URL("http://localhost:" + port + "/simple-webservice/Calculator?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorService"));
assertNotNull(calculatorService);
Modified: websites/staging/tomee/trunk/content/examples-trunk/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java Tue May 6 16:03:59 2014
@@ -23,19 +23,25 @@ import javax.naming.InitialContext;
import java.util.Properties;
/**
- * @version $Rev: 1422816 $ $Date: 2012-12-17 09:37:53 +0000 (Mon, 17 Dec 2012) $
+ * @version $Rev: 1591902 $ $Date: 2014-05-02 13:37:53 +0000 (Fri, 02 May 2014) $
*/
public class TelephoneTest extends TestCase {
//START SNIPPET: setup
+
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("ejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
@Override
protected void setUp() throws Exception {
final Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("ejbd.port", "" + port);
+
// Uncomment these properties to change the defaults
- //properties.setProperty("ejbd.port", "4202");
//properties.setProperty("ejbd.bind", "localhost");
//properties.setProperty("ejbd.threads", "200");
//properties.setProperty("ejbd.disabled", "false");
@@ -83,7 +89,7 @@ public class TelephoneTest extends TestC
public void testTalkOverRemoteNetwork() throws Exception {
final Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- properties.setProperty(Context.PROVIDER_URL, "ejbd://localhost:" + Integer.parseInt(System.getProperty("ejbd.port", "4201")));
+ properties.setProperty(Context.PROVIDER_URL, "ejbd://localhost:" + port);
final InitialContext remoteContext = new InitialContext(properties);
final Telephone telephone = (Telephone) remoteContext.lookup("TelephoneBeanRemote");
Modified: websites/staging/tomee/trunk/content/examples-trunk/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java Tue May 6 16:03:59 2014
@@ -34,12 +34,18 @@ public class AttachmentTest extends Test
//START SNIPPET: setup
private InitialContext initialContext;
+
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
protected void setUp() throws Exception {
Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
initialContext = new InitialContext(properties);
}
@@ -53,7 +59,7 @@ public class AttachmentTest extends Test
//START SNIPPET: webservice
public void testAttachmentViaWsInterface() throws Exception {
Service service = Service.create(
- new URL("http://127.0.0.1:4204/webservice-attachments/AttachmentImpl?wsdl"),
+ new URL("http://localhost:" + port + "/webservice-attachments/AttachmentImpl?wsdl"),
new QName("http://superbiz.org/wsdl", "AttachmentWsService"));
assertNotNull(service);
Modified: websites/staging/tomee/trunk/content/examples-trunk/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/webservice-handlerchain/src/test/java/org/superbiz/calculator/wsh/CalculatorTest.java Tue May 6 16:03:59 2014
@@ -30,10 +30,17 @@ import static org.junit.Assert.assertNot
public class CalculatorTest {
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
+
@BeforeClass
public static void setUp() throws Exception {
Properties properties = new Properties();
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
+
//properties.setProperty("httpejbd.print", "true");
//properties.setProperty("httpejbd.indent.xml", "true");
EJBContainer.createEJBContainer(properties);
@@ -42,7 +49,7 @@ public class CalculatorTest {
@Test
public void testCalculatorViaWsInterface() throws Exception {
final Service calculatorService = Service.create(
- new URL("http://127.0.0.1:4204/webservice-handlerchain/Calculator?wsdl"),
+ new URL("http://localhost:" + port + "/webservice-handlerchain/Calculator?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorService"));
assertNotNull(calculatorService);
Modified: websites/staging/tomee/trunk/content/examples-trunk/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/webservice-holder/src/test/java/org/superbiz/ws/out/CalculatorTest.java Tue May 6 16:03:59 2014
@@ -31,10 +31,17 @@ import static org.junit.Assert.assertNot
public class CalculatorTest {
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
+
@BeforeClass
public static void setUp() throws Exception {
Properties properties = new Properties();
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
+
// properties.setProperty("httpejbd.print", "true");
// properties.setProperty("httpejbd.indent.xml", "true");
EJBContainer.createEJBContainer(properties);
@@ -43,7 +50,7 @@ public class CalculatorTest {
@Test
public void outParams() throws Exception {
final Service calculatorService = Service.create(
- new URL("http://127.0.0.1:4204/webservice-holder/Calculator?wsdl"),
+ new URL("http://localhost:" + port + "/webservice-holder/Calculator?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorService"));
assertNotNull(calculatorService);
Modified: websites/staging/tomee/trunk/content/examples-trunk/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java Tue May 6 16:03:59 2014
@@ -31,6 +31,9 @@ public class InheritanceTest extends Tes
//START SNIPPET: setup
private InitialContext initialContext;
+
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
protected void setUp() throws Exception {
@@ -46,6 +49,9 @@ public class InheritanceTest extends Tes
p.put("wakeBoardDatabaseUnmanaged.JtaManaged", "false");
p.put("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ p.put("httpejbd.port", "" + port);
initialContext = new InitialContext(p);
}
@@ -59,7 +65,7 @@ public class InheritanceTest extends Tes
//START SNIPPET: webservice
public void testInheritanceViaWsInterface() throws Exception {
Service service = Service.create(
- new URL("http://127.0.0.1:4204/webservice-inheritance/WakeRiderImpl?wsdl"),
+ new URL("http://localhost:" + port + "/webservice-inheritance/WakeRiderImpl?wsdl"),
new QName("http://superbiz.org/wsdl", "InheritanceWsService"));
assertNotNull(service);
Modified: websites/staging/tomee/trunk/content/examples-trunk/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Tue May 6 16:03:59 2014
@@ -30,11 +30,17 @@ public class CalculatorTest extends Test
//START SNIPPET: setup
private InitialContext initialContext;
+
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
protected void setUp() throws Exception {
Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
initialContext = new InitialContext(properties);
}
@@ -47,7 +53,7 @@ public class CalculatorTest extends Test
*/
//START SNIPPET: webservice
public void testCalculatorViaWsInterface() throws Exception {
- URL url = new URL("http://127.0.0.1:4204/webservice-security/CalculatorImpl?wsdl");
+ URL url = new URL("http://localhost:" + port + "/webservice-security/CalculatorImpl?wsdl");
QName calcServiceQName = new QName("http://superbiz.org/wsdl", "CalculatorWsService");
Service calcService = Service.create(url, calcServiceQName);
assertNotNull(calcService);
Modified: websites/staging/tomee/trunk/content/examples-trunk/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Tue May 6 16:03:59 2014
@@ -45,11 +45,18 @@ import java.util.Properties;
public class CalculatorTest extends TestCase {
//START SNIPPET: setup
+
+ //Random port to avoid test conflicts
+ private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
+
@Override
protected void setUp() throws Exception {
final Properties properties = new Properties();
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
new InitialContext(properties);
}
@@ -57,7 +64,7 @@ public class CalculatorTest extends Test
//START SNIPPET: webservice
public void testCalculatorViaWsInterface() throws Exception {
- final Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImpl?wsdl"),
+ final Service calcService = Service.create(new URL("http://localhost:" + port + "/webservice-ws-security/CalculatorImpl?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -87,7 +94,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithTimestamp1way() throws Exception {
- final Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplTimestamp1way?wsdl"),
+ final Service calcService = Service.create(new URL("http://localhost:" + port + "/webservice-ws-security/CalculatorImplTimestamp1way?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -115,7 +122,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithTimestamp2ways() throws Exception {
- final Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplTimestamp2ways?wsdl"),
+ final Service calcService = Service.create(new URL("http://localhost:" + port + "/webservice-ws-security/CalculatorImplTimestamp2ways?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -149,7 +156,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithUsernameTokenPlainPassword() throws Exception {
- final Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplUsernameTokenPlainPassword?wsdl"),
+ final Service calcService = Service.create(new URL("http://localhost:" + port + "/webservice-ws-security/CalculatorImplUsernameTokenPlainPassword?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -188,7 +195,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithUsernameTokenHashedPassword() throws Exception {
- final Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplUsernameTokenHashedPassword?wsdl"),
+ final Service calcService = Service.create(new URL("http://localhost:" + port + "/webservice-ws-security/CalculatorImplUsernameTokenHashedPassword?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -227,7 +234,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithUsernameTokenPlainPasswordEncrypt() throws Exception {
- final Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplUsernameTokenPlainPasswordEncrypt?wsdl"),
+ final Service calcService = Service.create(new URL("http://localhost:" + port + "/webservice-ws-security/CalculatorImplUsernameTokenPlainPasswordEncrypt?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
@@ -269,7 +276,7 @@ public class CalculatorTest extends Test
}
public void testCalculatorViaWsInterfaceWithSign() throws Exception {
- final Service calcService = Service.create(new URL("http://127.0.0.1:4204/webservice-ws-security/CalculatorImplSign?wsdl"),
+ final Service calcService = Service.create(new URL("http://localhost:" + port + "/webservice-ws-security/CalculatorImplSign?wsdl"),
new QName("http://superbiz.org/wsdl", "CalculatorWsService"));
assertNotNull(calcService);
Modified: websites/staging/tomee/trunk/content/sitemap.html
==============================================================================
--- websites/staging/tomee/trunk/content/sitemap.html (original)
+++ websites/staging/tomee/trunk/content/sitemap.html Tue May 6 16:03:59 2014
@@ -164,7 +164,7 @@
<li><a href="deployment-id.html">Deployment ID</a></li>
<li><a href="deployments.html">Deployments</a></li>
<li><a href="details-on-openejb-jar.html">Details on openejb-jar</a></li>
-<li><a href="documentation.html">Index</a></li>
+<li><a href="documentation.html">Documentation</a></li>
<li><a href="dynamic-datasource.html">Dynamic Datasource</a></li>
<li><a href="eclipse-plugin.html">Eclipse Plugin</a></li>
<li><a href="ejb-+-jpa-+-jsf-+-jax-rs.html">EJB + JPA + JSF + JAX-RS</a></li>
Modified: websites/staging/tomee/trunk/content/understanding-the-directory-layout.html
==============================================================================
--- websites/staging/tomee/trunk/content/understanding-the-directory-layout.html (original)
+++ websites/staging/tomee/trunk/content/understanding-the-directory-layout.html Tue May 6 16:03:59 2014
@@ -128,21 +128,17 @@
</h1>
</div>
-<p>When freshly unpacked, OpenEJB will look like this:</p>
+<p>Unpacking the standalone OpenEJB will result in the following directory layout:</p>
-<pre><code>openejb-3.0/
-openejb-3.0/logs/
-openejb-3.0/apps/
-openejb-3.0/lib/
-openejb-3.0/lib/_<several jars>_
-openejb-3.0/LICENSE.txt
-openejb-3.0/NOTICE.txt
-openejb-3.0/README.txt
-openejb-3.0/bin/
-openejb-3.0/bin/openejb.bat
-openejb-3.0/bin/openejb
-openejb-3.0/conf/
-openejb-3.0/conf/README.txt
+<pre><code>apache-openejb-[version]\apps
+apache-openejb-[version]\bin
+apache-openejb-[version]\conf
+apache-openejb-[version]\data
+apache-openejb-[version]\lib
+apache-openejb-[version]\logs
+apache-openejb-[version]\LICENSE
+apache-openejb-[version]\NOTICE
+apache-openejb-[version]\README.txt
</code></pre>
<p><a name="UnderstandingtheDirectoryLayout-Directories"></a></p>
@@ -187,19 +183,19 @@ is unpacked. The first time OpenEJB is
be created:</p>
<pre><code> conf/
- openejb.xml (main config file)
-
- logging.properties (log levels and files)
-
+ openejb.xml (main config file)
+ logging.properties (log levels and files)
login.config (jaas config file)
users.properties (users that can log in)
groups.properties (groups in which users belong)
- admin.properties (network socket for administration)
- ejbd.properties (network socket for ejb invocations)
- hsql.properties (network socket for hsql client access)
- httpejbd.properties (network socket for ejb invocations over http)
- telnet.properties (network socket for telnet "server")
+ conf.d/
+
+ admin.properties (network socket for administration)
+ ejbd.properties (network socket for ejb invocations)
+ hsql.properties (network socket for hsql client access)
+ httpejbd.properties (network socket for ejb invocations over http)
+ telnet.properties (network socket for telnet "server")
</code></pre>
<p>These files can be edited as desired. If at any time you are unhappy with
Modified: websites/staging/tomee/trunk/content/weblogic.html
==============================================================================
--- websites/staging/tomee/trunk/content/weblogic.html (original)
+++ websites/staging/tomee/trunk/content/weblogic.html Tue May 6 16:03:59 2014
@@ -131,8 +131,8 @@
<p>How to lookup WebLogic Objects from within a TomEE context:</p>
<pre><code>Hashtable<String, String> props = new Hashtable<String, String>();
-props.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, **"weblogic.jndi.WLInitialContextFactory"**);
-props.put(javax.naming.Context.URL_PKG_PREFIXES, **"weblogic.jndi.factories"**);
+props.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, "weblogic.jndi.WLInitialContextFactory");
+props.put(javax.naming.Context.URL_PKG_PREFIXES, "weblogic.jndi.factories");
props.put("java.naming.provider.url", "t3://your.host.name:7023");
Context ctx = new InitialContext(props);