svn commit: r1754571 - /tomee/site/trunk/content/openejb.xml.mdtext
Author: rmannibucau Date: Fri Jul 29 20:25:22 2016 New Revision: 1754571 URL: http://svn.apache.org/viewvc?rev=1754571=rev Log: CMS commit to tomee by rmannibucau Modified: tomee/site/trunk/content/openejb.xml.mdtext Modified: tomee/site/trunk/content/openejb.xml.mdtext URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/openejb.xml.mdtext?rev=1754571=1754570=1754571=diff == --- tomee/site/trunk/content/openejb.xml.mdtext (original) +++ tomee/site/trunk/content/openejb.xml.mdtext Fri Jul 29 20:25:22 2016 @@ -1,9 +1,10 @@ Title: openejb.xml + # Overview The openejb.xml is the main configuration file for the container system and -it's services such as transaction, security, and data sources. +its services such as transaction, security, and data sources. The format is a mix of xml and properties inspired by the format of the httpd configuration file. Basically: @@ -33,16 +34,16 @@ to: You are free to use white space, ":", or "=" for your name/value pair -separator with no affect on OpenEJB. +separator with no effect on OpenEJB. ## Property Defaults and Overriding The openejb.xml file itself functions as an override, default values are specified via other means (service-jar.xml files in the classpath), -therefore you only need to specify property values here for 2 reasons: -1. you wish to for documentation purposes -1. you need to change the default value +therefore you only need to specify property values here for 2 reasons: +1. you wish to for documentation purposes +2. you need to change the default value The default openejb.xml file has most of the useful properties for each component explicitly listed with default values for documentation purposes. @@ -59,7 +60,7 @@ properties. See [System Properties](sys To know what properties can be overriden the './bin/openejb properties' command is very useful: see [Properties Tool](properties-tool.html) -It's function is to connect to a running server and print a canonical list +Its function is to connect to a running server and print a canonical list of all properties OpenEJB can see via the various means of configuration. When sending requests for help to the users list or jira, it is highly encouraged to send the output of this tool with your message. @@ -74,7 +75,7 @@ change someday, but untill then ServerSe conf/.properties files such as conf/ejbd.properties to configure the main protocol that services EJB client requests. -The format those properties files is greatly adapted from the xinet.d style +The format of those properties files is greatly adapted from the xinet.d style of configuration and even shares similar functionality and properties such as host-based authorization (HBA) via the 'only_from' property.
tomee git commit: TOMEE-1890 allow to configure provider url in remote tomee adapters
Repository: tomee Updated Branches: refs/heads/master 7edb1be6a -> 87fbc5038 TOMEE-1890 allow to configure provider url in remote tomee adapters Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/87fbc503 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/87fbc503 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/87fbc503 Branch: refs/heads/master Commit: 87fbc5038fa30d247c5721ac1379168fba03080a Parents: 7edb1be Author: Romain manni-BucauAuthored: Thu Jul 28 10:13:53 2016 +0200 Committer: Romain manni-Bucau Committed: Thu Jul 28 10:13:53 2016 +0200 -- .../remote/RemoteTomEEConfiguration.java| 10 ++ .../arquillian/remote/RemoteTomEEContainer.java | 5 +++ .../openejb/arquillian/TimeoutConfigTest.java | 35 .../webapp/TomEEWebappConfiguration.java| 9 + .../arquillian/webapp/TomEEWebappContainer.java | 5 +++ 5 files changed, 64 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java -- diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java index 63e78f0..7baf110 100644 --- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java +++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java @@ -52,6 +52,16 @@ public class RemoteTomEEConfiguration extends TomEEConfiguration { private boolean simpleLog; private String deployerProperties = ""; +private String providerUrlPattern = "%s"; + +public String getProviderUrlPattern() { +return providerUrlPattern; +} + +public void setProviderUrlPattern(String providerUrlPattern) { +this.providerUrlPattern = providerUrlPattern; +} + public String getGroupId() { return groupId; } http://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java -- diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java index 04ca053..fd87f53 100644 --- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java +++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java @@ -71,6 +71,11 @@ public class RemoteTomEEContainer extends TomEEContainerhttp://git-wip-us.apache.org/repos/asf/tomee/blob/87fbc503/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java -- diff --git a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java new file mode 100644 index 000..0f1f0d2 --- /dev/null +++ b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TimeoutConfigTest.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian; + +import org.apache.tomee.arquillian.remote.RemoteTomEEConfiguration; +import org.apache.tomee.arquillian.remote.RemoteTomEEContainer; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class
tomee git commit: TOMEE-1889 BASIC support for ejbd client
Repository: tomee Updated Branches: refs/heads/master 9f91bbcf1 -> 7edb1be6a TOMEE-1889 BASIC support for ejbd client Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7edb1be6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7edb1be6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7edb1be6 Branch: refs/heads/master Commit: 7edb1be6a17efb05a5ca37ff2919abd2a0aabe25 Parents: 9f91bbc Author: Romain manni-BucauAuthored: Wed Jul 27 17:57:06 2016 +0200 Committer: Romain manni-Bucau Committed: Wed Jul 27 17:57:06 2016 +0200 -- .../openejb/client/HttpConnectionFactory.java | 3 ++ .../openejb/client/HttpConnectionTest.java | 36 2 files changed, 39 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/7edb1be6/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java -- diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java b/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java index 93a3aae..844cb7d 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java @@ -79,6 +79,9 @@ public class HttpConnectionFactory implements ConnectionFactory { if (params.containsKey("readTimeout")) { httpURLConnection.setReadTimeout(Integer.parseInt(params.get("readTimeout"))); } +if (params.containsKey("authorization")) { +httpURLConnection.setRequestProperty("Authorization", params.get("authorization")); +} if (params.containsKey("sslKeyStore") || params.containsKey("sslTrustStore")) { try { http://git-wip-us.apache.org/repos/asf/tomee/blob/7edb1be6/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java -- diff --git a/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java b/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java index a3287a4..565ce56 100644 --- a/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java +++ b/server/openejb-client/src/test/java/org/apache/openejb/client/HttpConnectionTest.java @@ -46,6 +46,10 @@ public class HttpConnectionTest { final OutputStream responseBody = exchange.getResponseBody(); responseBody.write("secure page".getBytes()); +final String authorization = exchange.getRequestHeaders().getFirst("Authorization"); +if (authorization != null) { +responseBody.write(authorization.getBytes("UTF-8")); +} responseBody.close(); } }); @@ -88,4 +92,36 @@ public class HttpConnectionTest { Assert.assertTrue("should contain", sb.toString().contains("secure")); } } + +@Test +public void httpBasic() throws URISyntaxException, IOException { +final HttpConnectionFactory factory = new HttpConnectionFactory(); +final String url = "http://localhost:; + server.getAddress().getPort() + "/e?authorization=Basic%20token"; +for (int i = 0; i < 3; i++) { +final Connection connection = factory.getConnection(new URI(url)); + +BufferedReader br = null; +final StringBuilder sb = new StringBuilder(); +String line; +try { +br = new BufferedReader(new InputStreamReader(connection.getInputStream())); +while ((line = br.readLine()) != null) { +sb.append(line); +} +} catch (final IOException e) { +e.printStackTrace(); +} finally { +if (br != null) { +try { +br.close(); +} catch (IOException e) { +e.printStackTrace(); +} +} +connection.close(); +} + +Assert.assertTrue("should contain", sb.toString().contains("secure pageBasic token")); +} +} }
tomee git commit: TOMEE-1886 add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code
Repository: tomee Updated Branches: refs/heads/master 20ea8808a -> f54517fb3 TOMEE-1886 add tomee.embedded.add-callers flag to tomee embeddded to be able to skip add caller code Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f54517fb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f54517fb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f54517fb Branch: refs/heads/master Commit: f54517fb398807ed46120caa08ee841399656254 Parents: 20ea880 Author: Romain manni-BucauAuthored: Tue Jul 26 08:44:59 2016 +0200 Committer: Romain manni-Bucau Committed: Tue Jul 26 08:44:59 2016 +0200 -- .../src/main/java/org/apache/tomee/embedded/Container.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/f54517fb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java -- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java index bb2ccd5..d3d5538 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java @@ -278,7 +278,9 @@ public class Container implements AutoCloseable { throw new IllegalStateException(e); } -addCallersAsEjbModule(loader, app, additionalCallers); +if (!SystemInstance.isInitialized() || Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.embedded.add-callers", "true"))) { +addCallersAsEjbModule(loader, app, additionalCallers); +} systemInstance.addObserver(new StandardContextCustomizer(configuration, webModule, keepClassloader)); if (systemInstance.getComponent(AnnotationDeployer.FolderDDMapper.class) == null) {
tomee git commit: TOMEE-1882 ensuring we can pass arg with spaces to tomee.sh
Repository: tomee Updated Branches: refs/heads/master ca3cddba0 -> 20ea8808a TOMEE-1882 ensuring we can pass arg with spaces to tomee.sh Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/20ea8808 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/20ea8808 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/20ea8808 Branch: refs/heads/master Commit: 20ea8808a9a7509f2e9cda7c78a2254b83527a68 Parents: ca3cddb Author: Romain manni-BucauAuthored: Mon Jul 25 19:08:48 2016 +0200 Committer: Romain manni-Bucau Committed: Mon Jul 25 19:08:48 2016 +0200 -- tomee/apache-tomee/src/main/resources/tomee.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/20ea8808/tomee/apache-tomee/src/main/resources/tomee.sh -- diff --git a/tomee/apache-tomee/src/main/resources/tomee.sh b/tomee/apache-tomee/src/main/resources/tomee.sh index 1a02897..73982ca 100644 --- a/tomee/apache-tomee/src/main/resources/tomee.sh +++ b/tomee/apache-tomee/src/main/resources/tomee.sh @@ -130,6 +130,6 @@ if [ "$1" = "deploy" ] || [ "$1" = "undeploy" ]; then elif [ "$1" = "start" ] || [ "$1" = "stop" ]; then echo "To start or stop TomEE please use catalina.sh/startup.sh/shutdown.sh instead of tomee.sh" else -"$_RUNJAVA" $DEBUG $LOGGING_MANAGER -Dopenejb.base="$CATALINA_BASE" -cp "$CLASSPATH" org.apache.openejb.cli.Bootstrap $* +"$_RUNJAVA" $DEBUG $LOGGING_MANAGER -Dopenejb.base="$CATALINA_BASE" -cp "$CLASSPATH" org.apache.openejb.cli.Bootstrap "$@" fi
tomee git commit: TOMEE-1884 TOMEE-1883 propagate tomee embedded main args to a component and adding an event with tomee embedded scanner to extensions use the scanner too
Repository: tomee Updated Branches: refs/heads/master f38677d14 -> ca3cddba0 TOMEE-1884 TOMEE-1883 propagate tomee embedded main args to a component and adding an event with tomee embedded scanner to extensions use the scanner too Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ca3cddba Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ca3cddba Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ca3cddba Branch: refs/heads/master Commit: ca3cddba0a4023419d9bda2183e9583d6732388d Parents: f38677d Author: Romain manni-BucauAuthored: Mon Jul 25 08:55:40 2016 +0200 Committer: Romain manni-Bucau Committed: Mon Jul 25 08:55:40 2016 +0200 -- .../org/apache/tomee/embedded/Container.java| 20 ++- .../java/org/apache/tomee/embedded/Main.java| 4 +++ .../embedded/component/TomEEEmbeddedArgs.java | 37 .../event/TomEEEmbeddedScannerCreated.java | 33 + 4 files changed, 86 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/ca3cddba/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java -- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java index cd0cec0..bb2ccd5 100644 --- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java +++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java @@ -73,6 +73,7 @@ import org.apache.tomee.catalina.TomEERuntimeException; import org.apache.tomee.catalina.TomcatLoader; import org.apache.tomee.catalina.remote.TomEERemoteWebapp; import org.apache.tomee.catalina.session.QuickSessionManager; +import org.apache.tomee.embedded.event.TomEEEmbeddedScannerCreated; import org.apache.tomee.embedded.internal.StandardContextCustomizer; import org.apache.tomee.util.QuickServerXmlParser; import org.apache.velocity.Template; @@ -81,6 +82,7 @@ import org.apache.velocity.app.Velocity; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.log.NullLogChute; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; +import org.apache.xbean.finder.AnnotationFinder; import org.apache.xbean.finder.UrlSet; import org.apache.xbean.finder.filter.Filters; import org.apache.xbean.recipe.ObjectRecipe; @@ -236,16 +238,18 @@ public class Container implements AutoCloseable { webModule.setAddedUrls(Collections.emptyList()); webModule.setRarUrls(Collections.emptyList()); webModule.setScannableUrls(jarList); +final AnnotationFinder finder; try { final String filterContainerClasses = SystemInstance.get().getProperty("tomee.embedded.filter-container-classes"); -webModule.setFinder( -new FinderFactory.OpenEJBAnnotationFinder( -// skip container classes in scanning for shades -new WebappAggregatedArchive(webModule, jarList, -// see org.apache.openejb.config.DeploymentsResolver.ClasspathSearcher.cleanUpUrlSet() -jarList.size() <= 4 || "true".equalsIgnoreCase(filterContainerClasses) ? -new ContainerClassesFilter(configuration.getProperties()) /* shade */ : null)) -.link()); +finder = new FinderFactory.OpenEJBAnnotationFinder( +// skip container classes in scanning for shades +new WebappAggregatedArchive(webModule, jarList, +// see org.apache.openejb.config.DeploymentsResolver.ClasspathSearcher.cleanUpUrlSet() +jarList.size() <= 4 || "true".equalsIgnoreCase(filterContainerClasses) ? +new ContainerClassesFilter(configuration.getProperties()) /* shade */ : null)) +.link(); +SystemInstance.get().fireEvent(new TomEEEmbeddedScannerCreated(finder)); +webModule.setFinder(finder); } catch (final Exception e) { throw new IllegalArgumentException(e); } http://git-wip-us.apache.org/repos/asf/tomee/blob/ca3cddba/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java -- diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java index f9cd5af..e6bf317 100644 ---
svn commit: r1753778 [4/9] - in /tomee/site/trunk/content/ng: ./ admin/ admin/cluster/ admin/configuration/ advanced/ advanced/applicationcomposer/ advanced/shading/ advanced/tomee-embedded/ blog/ blo
Modified: tomee/site/trunk/content/ng/developer/ide/index.pdf URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/ng/developer/ide/index.pdf?rev=1753778=1753777=1753778=diff == --- tomee/site/trunk/content/ng/developer/ide/index.pdf (original) +++ tomee/site/trunk/content/ng/developer/ide/index.pdf Fri Jul 22 12:32:15 2016 @@ -4,8 +4,8 @@ << /Title (TomEE and IDE) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20160711092134+02'00') -/ModDate (D:20160711092134+02'00') +/CreationDate (D:20160722143050+02'00') +/ModDate (D:20160722143050+02'00') >> endobj 2 0 obj @@ -78,7 +78,7 @@ endobj endobj 8 0 obj << /Type /Font -/BaseFont /AH+NotoSerif +/BaseFont /AG+NotoSerif /Subtype /TrueType /FontDescriptor 28 0 R /FirstChar 32 @@ -335,7 +335,7 @@ endobj endobj 17 0 obj << /Type /Font -/BaseFont /AI+NotoSerif-Bold +/BaseFont /AH+NotoSerif-Bold /Subtype /TrueType /FontDescriptor 32 0 R /FirstChar 32 @@ -427,37 +427,36 @@ endobj endobj 27 0 obj << /Length1 6796 -/Length 4134 +/Length 4135 /Filter [/FlateDecode] >> stream xYP[×>çÞ«ÄK,ÁÕBz2É`ÄK