You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2018/12/10 13:23:49 UTC
[1/9] tomee git commit: TOMEE-2328 - remove parent and fix build
after that
Repository: tomee
Updated Branches:
refs/heads/master 326832ebd -> 9098aafec
TOMEE-2328 - remove parent and fix build after that
Signed-off-by: brunobat <br...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/457035ed
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/457035ed
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/457035ed
Branch: refs/heads/master
Commit: 457035edf57ccf2ef6e1953f201efaa91cf412ae
Parents: df72ac7
Author: brunobat <br...@gmail.com>
Authored: Fri Dec 7 10:37:14 2018 +0000
Committer: brunobat <br...@gmail.com>
Committed: Fri Dec 7 10:37:14 2018 +0000
----------------------------------------------------------------------
examples/mp-metrics-counted/pom.xml | 31 ++++++++++++++++----
.../src/main/webapp/WEB-INF/web.xml | 25 ++++++++++++++++
2 files changed, 51 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/457035ed/examples/mp-metrics-counted/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
index 9e12854..f6745ae 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -20,16 +20,22 @@
<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>examples</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>8.0.0-SNAPSHOT</version>
- </parent>
+
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz</groupId>
<artifactId>mp-metrics-counted</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <name>OpenEJB :: Examples :: Microprofile Metrics Counted</name>
+ <properties>
+ <version.javaee-api>8.0</version.javaee-api>
+ <microprofile.metrics.version>1.1</microprofile.metrics.version>
+ <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
+ <tomee.version>${project.version}</tomee.version>
+ <junit.version>4.12</junit.version>
+ </properties>
<dependencies>
<dependency>
@@ -45,6 +51,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
<version>${tomee.version}</version>
@@ -83,6 +95,15 @@
<context>${project.artifactId}</context>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/457035ed/examples/mp-metrics-counted/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-counted/src/main/webapp/WEB-INF/web.xml b/examples/mp-metrics-counted/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..3c030e7
--- /dev/null
+++ b/examples/mp-metrics-counted/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false"
+ version="2.5">
+
+ <display-name>Microprofile Metrics Counted</display-name>
+</web-app>
[6/9] tomee git commit: updates strings to use isEmpty method
Posted by jl...@apache.org.
updates strings to use isEmpty method
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5d75e345
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5d75e345
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5d75e345
Branch: refs/heads/master
Commit: 5d75e345b90dea135e3d1109bfde1032f091df10
Parents: 42605b7
Author: Otavio Santana <ot...@gmail.com>
Authored: Fri Dec 7 17:49:17 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Fri Dec 7 17:49:17 2018 -0200
----------------------------------------------------------------------
.../openejb/assembler/classic/EjbResolver.java | 2 +-
.../openejb/config/AnnotationDeployer.java | 28 ++++++++++----------
.../openejb/config/EjbJarInfoBuilder.java | 4 +--
.../config/PersistenceContextAnnFactory.java | 2 +-
.../openejb/core/ivm/naming/IvmContext.java | 2 +-
.../openejb/core/webservices/JaxWsUtils.java | 6 ++---
.../resource/jdbc/dbcp/BasicDataSource.java | 2 +-
.../jdbc/dbcp/BasicManagedDataSource.java | 2 +-
.../apache/openejb/util/Log4jPrintWriter.java | 4 +--
.../apache/openejb/util/LoggingPrintWriter.java | 4 +--
.../java/org/apache/openejb/util/Strings.java | 2 +-
.../openejb/jee/oejb2/NamespaceFilter.java | 2 +-
.../java/org/apache/openejb/loader/Options.java | 12 ++++-----
13 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
index ff0d273..51377cb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
@@ -234,7 +234,7 @@ public class EjbResolver {
public String resolve(final Reference ref, final URI moduleUri) {
- if (ref.getMappedName() != null && !ref.getMappedName().equals("")) {
+ if (ref.getMappedName() != null && !ref.getMappedName().isEmpty()) {
return ref.getMappedName();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 0996468..79b5ed8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -3151,7 +3151,7 @@ public class AnnotationDeployer implements DynamicDeployer {
final String className = webService.endpointInterface();
- if (!className.equals("")) {
+ if (!className.isEmpty()) {
sessionBean.setServiceEndpoint(className);
} else {
sessionBean.setServiceEndpoint(defaultEndpoint.getName());
@@ -3816,7 +3816,7 @@ public class AnnotationDeployer implements DynamicDeployer {
final InitMethod initMethod = new InitMethod(method.get());
final Init init = method.getAnnotation(Init.class);
- if (init.value() != null && !init.value().equals("")) {
+ if (init.value() != null && !init.value().isEmpty()) {
initMethod.setCreateMethod(init.value());
}
@@ -4119,7 +4119,7 @@ public class AnnotationDeployer implements DynamicDeployer {
final String name = consumer.getJndiConsumerName();
if (member == null) {
boolean shouldReturn = false;
- if (ejb.name().equals("")) {
+ if (ejb.name().isEmpty()) {
fail(name, "ejbAnnotation.onClassWithNoName");
shouldReturn = true;
}
@@ -4209,21 +4209,21 @@ public class AnnotationDeployer implements DynamicDeployer {
// Set the ejb-link, if any
String ejbName = ejb.beanName();
- if (ejbName.equals("")) {
+ if (ejbName.isEmpty()) {
ejbName = null;
}
ejbRef.setEjbLink(ejbName);
// Set the mappedName, if any
String mappedName = ejb.mappedName();
- if (mappedName.equals("")) {
+ if (mappedName.isEmpty()) {
mappedName = null;
}
ejbRef.setMappedName(mappedName);
// Set lookup name, if any
String lookupName = getLookupName(ejb);
- if (lookupName.equals("")) {
+ if (lookupName.isEmpty()) {
lookupName = null;
}
ejbRef.setLookupName(lookupName);
@@ -4347,7 +4347,7 @@ public class AnnotationDeployer implements DynamicDeployer {
// Get the ref-name
String refName = resource.name();
- if (refName.equals("")) {
+ if (refName.isEmpty()) {
refName = member.getDeclaringClass().getName() + "/" + member.getName();
}
@@ -4399,7 +4399,7 @@ public class AnnotationDeployer implements DynamicDeployer {
* Add an env-entry via @Resource if 'lookup' attribute is set.
*/
final String lookupName = getLookupName(resource);
- if (!lookupName.equals("")) {
+ if (!lookupName.isEmpty()) {
final EnvEntry envEntry = new EnvEntry();
envEntry.setName(refName);
consumer.getEnvEntry().add(envEntry);
@@ -4480,14 +4480,14 @@ public class AnnotationDeployer implements DynamicDeployer {
}
// Override the mapped name if not set
- if (reference.getMappedName() == null && !resource.mappedName().equals("")) {
+ if (reference.getMappedName() == null && !resource.mappedName().isEmpty()) {
reference.setMappedName(resource.mappedName());
}
// Override the lookup name if not set
if (reference.getLookupName() == null) {
final String lookupName = getLookupName(resource);
- if (!lookupName.equals("")) {
+ if (!lookupName.isEmpty()) {
reference.setLookupName(lookupName);
}
}
@@ -4606,7 +4606,7 @@ public class AnnotationDeployer implements DynamicDeployer {
}
}
- if (persistenceUnitRef.getPersistenceUnitName() == null && !persistenceUnit.unitName().equals("")) {
+ if (persistenceUnitRef.getPersistenceUnitName() == null && !persistenceUnit.unitName().isEmpty()) {
persistenceUnitRef.setPersistenceUnitName(persistenceUnit.unitName());
}
}
@@ -4903,7 +4903,7 @@ public class AnnotationDeployer implements DynamicDeployer {
ServiceRef serviceRef;
String refName = webService.name();
- if (refName.equals("")) {
+ if (refName.isEmpty()) {
if (member == null) {
//TODO fail
return;
@@ -4964,7 +4964,7 @@ public class AnnotationDeployer implements DynamicDeployer {
// Set the mappedName
if (serviceRef.getMappedName() == null) {
String mappedName = webService.mappedName();
- if (mappedName.equals("")) {
+ if (mappedName.isEmpty()) {
mappedName = null;
}
serviceRef.setMappedName(mappedName);
@@ -4973,7 +4973,7 @@ public class AnnotationDeployer implements DynamicDeployer {
// wsdl file
if (serviceRef.getWsdlFile() == null) {
final String wsdlLocation = webService.wsdlLocation();
- if (!wsdlLocation.equals("")) {
+ if (!wsdlLocation.isEmpty()) {
serviceRef.setWsdlFile(wsdlLocation);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
index 1d0ba80..1ef4dd2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
@@ -665,11 +665,11 @@ public class EjbJarInfoBuilder {
methodInfo.ejbName = method.getEjbName();
methodInfo.methodIntf = method.getMethodIntf() == null ? null : method.getMethodIntf().toString();
methodInfo.methodName = method.getMethodName();
- if (methodInfo.methodName == null || methodInfo.methodName.equals("")) {
+ if (methodInfo.methodName == null || methodInfo.methodName.isEmpty()) {
methodInfo.methodName = "*";
}
methodInfo.className = method.getClassName();
- if (methodInfo.className == null || methodInfo.className.equals("")) {
+ if (methodInfo.className == null || methodInfo.className.isEmpty()) {
methodInfo.className = "*";
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
index f15f4ab..1ab0dcc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
@@ -84,7 +84,7 @@ public class PersistenceContextAnnFactory {
}
String name = persistenceContext.name();
- if (name == null || name.equals("")) {
+ if (name == null || name.isEmpty()) {
name = member == null ? null : member.getDeclaringClass().getName() + "/" + member.getName();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
index 3a6d985..0c9eb04 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
@@ -109,7 +109,7 @@ public class IvmContext implements Context, Serializable {
}
public Object lookup(final String compositName) throws NamingException {
- if (compositName.equals("")) {
+ if (compositName.isEmpty()) {
return this;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
index 29f04b2..6dd3931 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
@@ -286,12 +286,12 @@ public final class JaxWsUtils {
public static String getServiceWsdlLocation(final Class<?> clazz, final ClassLoader loader) {
final String wsdlLocation = getWsdlLocation(clazz);
- if (wsdlLocation != null && !wsdlLocation.equals("")) {
+ if (wsdlLocation != null && !wsdlLocation.isEmpty()) {
return wsdlLocation;
}
final String serviceInterfaceClassName = getServiceInterface(clazz);
- if (serviceInterfaceClassName != null && !serviceInterfaceClassName.equals("")) {
+ if (serviceInterfaceClassName != null && !serviceInterfaceClassName.isEmpty()) {
try {
final Class serviceInterfaceClass = loader.loadClass(serviceInterfaceClassName);
return getWsdlLocation(serviceInterfaceClass);
@@ -304,7 +304,7 @@ public final class JaxWsUtils {
public static boolean containsWsdlLocation(final Class<?> clazz, final ClassLoader loader) {
final String wsdlLocSEIFromAnnotation = getServiceWsdlLocation(clazz, loader);
- return wsdlLocSEIFromAnnotation != null && !wsdlLocSEIFromAnnotation.equals("");
+ return wsdlLocSEIFromAnnotation != null && !wsdlLocSEIFromAnnotation.isEmpty();
}
public static String getBindingUriFromAnn(final Class<?> clazz) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
index 38a5097..181ec26 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
@@ -153,7 +153,7 @@ public class BasicDataSource extends org.apache.commons.dbcp2.BasicDataSource im
}
public synchronized void setDefaultTransactionIsolation(final String s) {
- if (s == null || s.equals("")) {
+ if (s == null || s.isEmpty()) {
return;
}
final int level = IsolationLevels.getIsolationLevel(s);
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
index c3d92e5..6983a60 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
@@ -260,7 +260,7 @@ public class BasicManagedDataSource extends org.apache.commons.dbcp2.managed.Bas
final ReentrantLock l = lock;
l.lock();
try {
- if (s == null || s.equals("")) {
+ if (s == null || s.isEmpty()) {
return;
}
final int level = IsolationLevels.getIsolationLevel(s);
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
index f8b3069..6a11c5d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
@@ -46,7 +46,7 @@ public class Log4jPrintWriter extends PrintWriter {
}
public void flush() {
- if (!text.toString().equals("")) {
+ if (!text.toString().isEmpty()) {
flushLine();
}
}
@@ -88,7 +88,7 @@ public class Log4jPrintWriter extends PrintWriter {
}
public void println() {
- if (!text.toString().equals("")) {
+ if (!text.toString().isEmpty()) {
flushLine();
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/util/LoggingPrintWriter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/LoggingPrintWriter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/LoggingPrintWriter.java
index ab26c0d..561f318 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/LoggingPrintWriter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/LoggingPrintWriter.java
@@ -41,7 +41,7 @@ public class LoggingPrintWriter extends PrintWriter {
}
public void flush() {
- if (!text.toString().equals("")) {
+ if (!text.toString().isEmpty()) {
flushLine();
}
}
@@ -83,7 +83,7 @@ public class LoggingPrintWriter extends PrintWriter {
}
public void println() {
- if (!text.toString().equals("")) {
+ if (!text.toString().isEmpty()) {
flushLine();
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
index f1b8e48..b568308 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
@@ -100,7 +100,7 @@ public class Strings {
}
public static String replaceNullOrBlankStringWithNonBreakingSpace(final String stringToCheckForNull) {
- if (stringToCheckForNull == null || stringToCheckForNull.equals("")) {
+ if (stringToCheckForNull == null || stringToCheckForNull.isEmpty()) {
return " ";
} else {
return stringToCheckForNull;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
index 896f234..a8a1eb1 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
@@ -190,7 +190,7 @@ public class NamespaceFilter extends XMLFilterImpl {
} else {
uri = possibleNamespaces.get(0);
}
- } else if (correctable && !previousNs.equals(uri) && !previousNs.equals("")) {
+ } else if (correctable && !previousNs.equals(uri) && !previousNs.isEmpty()) {
uri = previousNs;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5d75e345/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java
index d6e2482..fb4ac13 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java
@@ -112,7 +112,7 @@ public class Options {
final String value = properties.getProperty(property);
- if (value == null || value.equals("")) {
+ if (value == null || value.isEmpty()) {
return parent.get(property, defaultValue);
}
@@ -131,7 +131,7 @@ public class Options {
public int get(final String property, final int defaultValue) {
final String value = properties.getProperty(property);
- if (value == null || value.equals("")) {
+ if (value == null || value.isEmpty()) {
return parent.get(property, defaultValue);
}
@@ -146,7 +146,7 @@ public class Options {
public long get(final String property, final long defaultValue) {
final String value = properties.getProperty(property);
- if (value == null || value.equals("")) {
+ if (value == null || value.isEmpty()) {
return parent.get(property, defaultValue);
}
@@ -161,7 +161,7 @@ public class Options {
public boolean get(final String property, final boolean defaultValue) {
final String value = properties.getProperty(property);
- if (value == null || value.equals("")) {
+ if (value == null || value.isEmpty()) {
return parent.get(property, defaultValue);
}
@@ -192,7 +192,7 @@ public class Options {
public <T extends Enum<T>> T get(final String property, final T defaultValue) {
final String value = properties.getProperty(property);
- if (value == null || value.equals("")) {
+ if (value == null || value.isEmpty()) {
return parent.get(property, defaultValue);
}
@@ -234,7 +234,7 @@ public class Options {
protected <T extends Enum<T>> Set<T> getAll(final String property, final Set<T> defaultValue, final Class<T> enumType) {
final String value = properties.getProperty(property);
- if (value == null || value.equals("")) {
+ if (value == null || value.isEmpty()) {
return parent.getAll(property, defaultValue, enumType);
}
[3/9] tomee git commit: TOMEE-2328 - Delete orfaned project. See
connector-ear
Posted by jl...@apache.org.
TOMEE-2328 - Delete orfaned project. See connector-ear
Signed-off-by: brunobat <br...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8d5fb635
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8d5fb635
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8d5fb635
Branch: refs/heads/master
Commit: 8d5fb63510d4a22045f9216c0f8d3f6bad8902cf
Parents: 368abd9
Author: brunobat <br...@gmail.com>
Authored: Fri Dec 7 10:57:07 2018 +0000
Committer: brunobat <br...@gmail.com>
Committed: Fri Dec 7 10:57:07 2018 +0000
----------------------------------------------------------------------
.../connector/starter/api/SampleConnection.java | 26 ----
.../starter/api/SampleConnectionFactory.java | 28 ----
.../adapter/SampleConnectionFactoryImpl.java | 69 ---------
.../starter/adapter/SampleConnectionImpl.java | 44 ------
.../adapter/SampleManagedConnection.java | 139 -------------------
.../adapter/SampleManagedConnectionFactory.java | 108 --------------
.../SampleManagedConnectionMetaData.java | 58 --------
.../connector-starter-rar/pom.xml | 43 ------
.../connector-ear-sample/moviefun-ear/pom.xml | 74 ----------
9 files changed, 589 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnection.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnection.java b/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnection.java
deleted file mode 100644
index 80f492c..0000000
--- a/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnection.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.tomitribe.connector.starter.api;
-
-public interface SampleConnection {
- public void sendMessage(final String message);
-
- public void close();
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnectionFactory.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnectionFactory.java b/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnectionFactory.java
deleted file mode 100644
index 47f5879..0000000
--- a/examples/connector-ear-sample/connector-starter-api/src/main/java/org/tomitribe/connector/starter/api/SampleConnectionFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.tomitribe.connector.starter.api;
-
-import javax.resource.Referenceable;
-import javax.resource.ResourceException;
-import java.io.Serializable;
-
-public interface SampleConnectionFactory extends Serializable, Referenceable {
- public SampleConnection getConnection() throws ResourceException;
-
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionFactoryImpl.java b/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionFactoryImpl.java
deleted file mode 100644
index c426a76..0000000
--- a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionFactoryImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.tomitribe.connector.starter.adapter;
-
-import org.tomitribe.connector.starter.api.SampleConnection;
-import org.tomitribe.connector.starter.api.SampleConnectionFactory;
-
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionManager;
-import java.util.logging.Logger;
-
-public class SampleConnectionFactoryImpl implements SampleConnectionFactory {
- private static final long serialVersionUID = 1L;
-
- private static Logger log = Logger.getLogger(SampleConnectionFactoryImpl.class.getName());
-
- private Reference reference;
-
- private SampleManagedConnectionFactory mcf;
-
- private ConnectionManager connectionManager;
-
- public SampleConnectionFactoryImpl() {
-
- }
-
- public SampleConnectionFactoryImpl(SampleManagedConnectionFactory mcf, ConnectionManager cxManager) {
- this.mcf = mcf;
- this.connectionManager = cxManager;
- }
-
- @Override
- public SampleConnection getConnection() throws ResourceException {
- log.finest("getConnection()");
- return (SampleConnection) connectionManager.allocateConnection(mcf, null);
- }
-
- @Override
- public Reference getReference() throws NamingException {
- log.finest("getReference()");
- return reference;
- }
-
- @Override
- public void setReference(Reference reference) {
- log.finest("setReference()");
- this.reference = reference;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionImpl.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionImpl.java b/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionImpl.java
deleted file mode 100644
index 1bbc59d..0000000
--- a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleConnectionImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.tomitribe.connector.starter.adapter;
-
-import org.tomitribe.connector.starter.api.SampleConnection;
-
-import java.util.logging.Logger;
-
-public class SampleConnectionImpl implements SampleConnection {
- private static Logger log = Logger.getLogger(SampleConnectionImpl.class.getName());
-
- private SampleManagedConnection mc;
-
- private SampleManagedConnectionFactory mcf;
-
- public SampleConnectionImpl(SampleManagedConnection mc, SampleManagedConnectionFactory mcf) {
- this.mc = mc;
- this.mcf = mcf;
- }
-
- public void sendMessage(final String message) {
- mc.sendMessage(message);
- }
-
- public void close() {
- mc.closeHandle(this);
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnection.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnection.java b/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnection.java
deleted file mode 100644
index 9762dfc..0000000
--- a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnection.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.tomitribe.connector.starter.adapter;
-
-import org.tomitribe.connector.starter.api.SampleConnection;
-
-import javax.resource.NotSupportedException;
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionEvent;
-import javax.resource.spi.ConnectionEventListener;
-import javax.resource.spi.ConnectionRequestInfo;
-import javax.resource.spi.LocalTransaction;
-import javax.resource.spi.ManagedConnection;
-import javax.resource.spi.ManagedConnectionMetaData;
-import javax.security.auth.Subject;
-import javax.transaction.xa.XAResource;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Logger;
-
-public class SampleManagedConnection implements ManagedConnection {
-
- private static Logger log = Logger.getLogger(SampleManagedConnection.class.getName());
-
- private PrintWriter logwriter;
-
- private SampleManagedConnectionFactory mcf;
-
- private List<ConnectionEventListener> listeners;
-
- private SampleConnectionImpl connection;
-
- public SampleManagedConnection(SampleManagedConnectionFactory mcf) {
- this.mcf = mcf;
- this.logwriter = null;
- this.listeners = Collections.synchronizedList(new ArrayList<ConnectionEventListener>(1));
- this.connection = null;
- }
-
- public Object getConnection(Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- log.finest("getConnection()");
- connection = new SampleConnectionImpl(this, mcf);
- return connection;
- }
-
- public void associateConnection(Object connection) throws ResourceException {
- log.finest("associateConnection()");
-
- if (connection == null)
- throw new ResourceException("Null connection handle");
-
- if (!(connection instanceof SampleConnectionImpl))
- throw new ResourceException("Wrong connection handle");
-
- this.connection = (SampleConnectionImpl) connection;
- }
-
- public void cleanup() throws ResourceException {
- log.finest("cleanup()");
- }
-
- public void destroy() throws ResourceException {
- log.finest("destroy()");
- }
-
- public void addConnectionEventListener(ConnectionEventListener listener) {
- log.finest("addConnectionEventListener()");
-
- if (listener == null) {
- throw new IllegalArgumentException("Listener is null");
- }
-
- listeners.add(listener);
- }
-
- public void removeConnectionEventListener(ConnectionEventListener listener) {
- log.finest("removeConnectionEventListener()");
- if (listener == null)
- throw new IllegalArgumentException("Listener is null");
- listeners.remove(listener);
- }
-
- void closeHandle(SampleConnection handle) {
- ConnectionEvent event = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
- event.setConnectionHandle(handle);
- for (ConnectionEventListener cel : listeners) {
- cel.connectionClosed(event);
- }
- }
-
- public PrintWriter getLogWriter() throws ResourceException {
- log.finest("getLogWriter()");
- return logwriter;
- }
-
- public void setLogWriter(PrintWriter out) throws ResourceException {
- log.finest("setLogWriter()");
- logwriter = out;
- }
-
- public LocalTransaction getLocalTransaction() throws ResourceException {
- throw new NotSupportedException("getLocalTransaction() not supported");
- }
-
- public XAResource getXAResource() throws ResourceException {
- throw new NotSupportedException("getXAResource() not supported");
- }
-
- public ManagedConnectionMetaData getMetaData() throws ResourceException {
- log.finest("getMetaData()");
- return new SampleManagedConnectionMetaData();
- }
-
- void sendMessage(final String message) {
- log.finest("sendMessage()");
-
- final SampleResourceAdapter resourceAdapter = (SampleResourceAdapter) mcf.getResourceAdapter();
- resourceAdapter.sendMessage(message);
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionFactory.java b/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionFactory.java
deleted file mode 100644
index 121105b..0000000
--- a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionFactory.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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.tomitribe.connector.starter.adapter;
-
-import org.tomitribe.connector.starter.api.SampleConnection;
-import org.tomitribe.connector.starter.api.SampleConnectionFactory;
-
-import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.Set;
-
-import java.util.logging.Logger;
-
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionDefinition;
-import javax.resource.spi.ConnectionManager;
-import javax.resource.spi.ConnectionRequestInfo;
-import javax.resource.spi.ManagedConnection;
-import javax.resource.spi.ManagedConnectionFactory;
-import javax.resource.spi.ResourceAdapter;
-import javax.resource.spi.ResourceAdapterAssociation;
-
-import javax.security.auth.Subject;
-
-@ConnectionDefinition(connectionFactory = SampleConnectionFactory.class,
- connectionFactoryImpl = SampleConnectionFactoryImpl.class,
- connection = SampleConnection.class,
- connectionImpl = SampleConnectionImpl.class)
-public class SampleManagedConnectionFactory implements ManagedConnectionFactory, ResourceAdapterAssociation {
-
- private static final long serialVersionUID = 1L;
-
- private static Logger log = Logger.getLogger(SampleManagedConnectionFactory.class.getName());
-
- private ResourceAdapter ra;
-
- private PrintWriter logwriter;
-
- public SampleManagedConnectionFactory() {
-
- }
-
- public Object createConnectionFactory(ConnectionManager cxManager) throws ResourceException {
- log.finest("createConnectionFactory()");
- return new SampleConnectionFactoryImpl(this, cxManager);
- }
-
- public Object createConnectionFactory() throws ResourceException {
- throw new ResourceException("This resource adapter doesn't support non-managed environments");
- }
-
- public ManagedConnection createManagedConnection(Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- log.finest("createManagedConnection()");
- return new SampleManagedConnection(this);
- }
-
- public ManagedConnection matchManagedConnections(Set connectionSet,
- Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- log.finest("matchManagedConnections()");
- ManagedConnection result = null;
- Iterator it = connectionSet.iterator();
- while (result == null && it.hasNext()) {
- ManagedConnection mc = (ManagedConnection) it.next();
- if (mc instanceof SampleManagedConnection) {
- result = mc;
- }
-
- }
- return result;
- }
-
- public PrintWriter getLogWriter() throws ResourceException {
- log.finest("getLogWriter()");
- return logwriter;
- }
-
- public void setLogWriter(PrintWriter out) throws ResourceException {
- log.finest("setLogWriter()");
- logwriter = out;
- }
-
- public ResourceAdapter getResourceAdapter() {
- log.finest("getResourceAdapter()");
- return ra;
- }
-
- public void setResourceAdapter(ResourceAdapter ra) {
- log.finest("setResourceAdapter()");
- this.ra = ra;
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionMetaData.java b/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionMetaData.java
deleted file mode 100644
index 4bb5878..0000000
--- a/examples/connector-ear-sample/connector-starter-impl/src/main/java/org/tomitribe/connector/starter/adapter/SampleManagedConnectionMetaData.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.tomitribe.connector.starter.adapter;
-
-import java.util.logging.Logger;
-
-import javax.resource.ResourceException;
-
-import javax.resource.spi.ManagedConnectionMetaData;
-
-public class SampleManagedConnectionMetaData implements ManagedConnectionMetaData {
-
- private static Logger log = Logger.getLogger(SampleManagedConnectionMetaData.class.getName());
-
- public SampleManagedConnectionMetaData() {
-
- }
-
- @Override
- public String getEISProductName() throws ResourceException {
- log.finest("getEISProductName()");
- return null; //TODO
- }
-
- @Override
- public String getEISProductVersion() throws ResourceException {
- log.finest("getEISProductVersion()");
- return null; //TODO
- }
-
- @Override
- public int getMaxConnections() throws ResourceException {
- log.finest("getMaxConnections()");
- return 0; //TODO
- }
-
- @Override
- public String getUserName() throws ResourceException {
- log.finest("getUserName()");
- return null; //TODO
- }
-}
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/connector-starter-rar/pom.xml
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/connector-starter-rar/pom.xml b/examples/connector-ear-sample/connector-starter-rar/pom.xml
deleted file mode 100644
index 510e33c..0000000
--- a/examples/connector-ear-sample/connector-starter-rar/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<!-- $Rev: 1387962 $ $Date: 2012-09-20 05:53:17 -0500 (Thu, 20 Sep 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>
-
- <parent>
- <groupId>org.tomitribe</groupId>
- <artifactId>connector-starter-parent</artifactId>
- <version>8.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>connector-starter-rar</artifactId>
- <packaging>rar</packaging>
- <name>Connector Starter :: Resource Adapter</name>
-
- <dependencies>
- <dependency>
- <groupId>org.tomitribe</groupId>
- <artifactId>connector-starter-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d5fb635/examples/connector-ear-sample/moviefun-ear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/connector-ear-sample/moviefun-ear/pom.xml b/examples/connector-ear-sample/moviefun-ear/pom.xml
deleted file mode 100644
index 3b94f76..0000000
--- a/examples/connector-ear-sample/moviefun-ear/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<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">
-
- <parent>
- <groupId>org.superbiz</groupId>
- <artifactId>moviefun-ear-parent</artifactId>
- <version>8.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>moviefun-ear</artifactId>
- <packaging>ear</packaging>
- <name>OpenEJB :: Examples :: Simple EAR :: EAR Packaging</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.superbiz</groupId>
- <artifactId>moviefun-business-logic</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.superbiz</groupId>
- <artifactId>moviefun-webapp</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.10.1</version>
- <configuration>
- <version>6</version>
- <generateApplicationXml>true</generateApplicationXml>
- <defaultLibBundleDir>lib</defaultLibBundleDir>
- <modules>
- <webModule>
- <groupId>org.superbiz</groupId>
- <artifactId>moviefun-webapp</artifactId>
- <contextRoot>/moviefun</contextRoot>
- </webModule>
- <ejbModule>
- <groupId>org.superbiz</groupId>
- <artifactId>moviefun-business-logic</artifactId>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
[8/9] tomee git commit: This closes apache/tomee#259
Posted by jl...@apache.org.
This closes apache/tomee#259
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/983f68bf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/983f68bf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/983f68bf
Branch: refs/heads/master
Commit: 983f68bf528d2155d1135a6653114701d88631aa
Parents: fbe2c48 b5cb42f
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Mon Dec 10 14:21:13 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Mon Dec 10 14:21:13 2018 +0100
----------------------------------------------------------------------
.../org/apache/openejb/junit/OpenEjbRunner.java | 1 +
examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +-
.../connector/starter/api/SampleConnection.java | 26 ----
.../starter/api/SampleConnectionFactory.java | 28 ----
.../adapter/SampleConnectionFactoryImpl.java | 69 ---------
.../starter/adapter/SampleConnectionImpl.java | 44 ------
.../adapter/SampleManagedConnection.java | 139 -------------------
.../adapter/SampleManagedConnectionFactory.java | 108 --------------
.../SampleManagedConnectionMetaData.java | 58 --------
.../connector-starter-rar/pom.xml | 43 ------
.../connector-ear-sample/moviefun-ear/pom.xml | 74 ----------
examples/ear-testing/business-logic/pom.xml | 2 +-
examples/ear-testing/business-model/pom.xml | 2 +-
examples/ear-testing/pom.xml | 2 +-
examples/javamail/pom.xml | 2 +-
examples/mp-metrics-counted/pom.xml | 33 ++++-
.../src/main/webapp/WEB-INF/web.xml | 25 ++++
examples/mp-metrics-timed/pom.xml | 37 +++--
.../src/main/webapp/WEB-INF/web.xml | 25 ++++
examples/mvc-cxf/pom.xml | 2 +-
20 files changed, 113 insertions(+), 609 deletions(-)
----------------------------------------------------------------------
[7/9] tomee git commit: Uses indexOf with chart instead of String
Posted by jl...@apache.org.
Uses indexOf with chart instead of String
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fbe2c486
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fbe2c486
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fbe2c486
Branch: refs/heads/master
Commit: fbe2c486d8c9000626126c8dba9ee694e7b04682
Parents: 5d75e34
Author: Otavio Santana <ot...@gmail.com>
Authored: Fri Dec 7 17:51:01 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Fri Dec 7 17:51:01 2018 -0200
----------------------------------------------------------------------
.../org/apache/openejb/assembler/classic/Assembler.java | 4 ++--
.../apache/openejb/assembler/classic/JndiBuilder.java | 2 +-
.../src/main/java/org/apache/openejb/cli/Bootstrap.java | 6 +++---
.../src/main/java/org/apache/openejb/cli/MainImpl.java | 6 +++---
.../org/apache/openejb/config/InitEjbDeployments.java | 2 +-
.../org/apache/openejb/config/QuickServerXmlParser.java | 2 +-
.../java/org/apache/openejb/config/ServiceUtils.java | 12 ++++++------
.../org/apache/openejb/core/ivm/naming/IvmContext.java | 8 ++++----
.../org/apache/openejb/core/timer/EJBCronTrigger.java | 2 +-
.../openejb/resource/jdbc/router/FailOverRouter.java | 2 +-
.../java/org/apache/openejb/util/AnnotationFinder.java | 2 +-
.../org/apache/openejb/util/IntrospectionSupport.java | 2 +-
.../src/main/java/org/apache/openejb/util/Logger.java | 4 ++--
.../src/main/java/org/apache/openejb/util/Messages.java | 2 +-
.../main/java/org/apache/openejb/util/URISupport.java | 10 +++++-----
.../java/org/apache/openejb/util/UpdateChecker.java | 2 +-
.../src/main/java/org/apache/openejb/util/UrlCache.java | 2 +-
.../openejb/util/proxy/LocalBeanProxyFactory.java | 2 +-
.../apache/openejb/web/LightweightWebAppBuilder.java | 2 +-
.../openejb/config/rules/ValidationKeysAuditorTest.java | 4 ++--
.../main/java/org/apache/openejb/javaagent/Agent.java | 2 +-
.../openejb/jee/HandlerChainsStringQNameAdapter.java | 2 +-
.../openejb/loader/provisining/MavenResolver.java | 2 +-
23 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index a0cf0fb..b7b2c3a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -1434,7 +1434,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
// a bit weird but just to be consistent if user doesn't lookup directly the resource
final Context lastContext = Contexts.createSubcontexts(containerSystemContext, path);
try {
- lastContext.rebind(path.substring(path.lastIndexOf("/") + 1, path.length()), value.getValue());
+ lastContext.rebind(path.substring(path.lastIndexOf('/') + 1, path.length()), value.getValue());
} catch (final NameAlreadyBoundException nabe) {
nabe.printStackTrace();
}
@@ -2630,7 +2630,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
object = globalContext.lookup(name);
} catch (final NamingException e) {
// if we catch a NamingException, check to see if the resource is a LaztObjectReference that has not been initialized correctly
- final String ctx = name.substring(0, name.lastIndexOf("/"));
+ final String ctx = name.substring(0, name.lastIndexOf('/'));
final String objName = name.substring(ctx.length() + 1);
final NamingEnumeration<Binding> bindings = globalContext.listBindings(ctx);
while (bindings.hasMoreElements()) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
index 1f22357..640fb42 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
@@ -203,7 +203,7 @@ public class JndiBuilder {
format = options.get(JNDINAME_FORMAT, "{deploymentId}{interfaceType.annotationName}");
{ // illegal format check
- final int index = format.indexOf(":");
+ final int index = format.indexOf(':');
if (index > -1) {
logger.error("Illegal " + JNDINAME_FORMAT + " contains a colon ':'. Everything before the colon will be removed, '" + format + "' ");
format = format.substring(index + 1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java b/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
index 9582fcb..1b5ca52 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
@@ -64,7 +64,7 @@ public class Bootstrap {
if (classURL != null) {
String propsString = classURL.getFile();
- propsString = propsString.substring(0, propsString.indexOf("!"));
+ propsString = propsString.substring(0, propsString.indexOf('!'));
final URI uri = URLs.uri(propsString);
@@ -83,8 +83,8 @@ public class Bootstrap {
}
private static void addProperty(final String arg) {
- final String prop = arg.substring(arg.indexOf("-D") + 2, arg.indexOf("="));
- final String val = arg.substring(arg.indexOf("=") + 1);
+ final String prop = arg.substring(arg.indexOf("-D") + 2, arg.indexOf('='));
+ final String val = arg.substring(arg.indexOf('=') + 1);
JavaSecurityManagers.setSystemProperty(prop, val);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
index 239a860..e241f17 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
@@ -166,8 +166,8 @@ public class MainImpl implements Main {
// be changed.
for (final String arg : args) {
if (arg.indexOf("-Dopenejb.base") != -1) {
- final String prop = arg.substring(arg.indexOf("-D") + 2, arg.indexOf("="));
- final String val = arg.substring(arg.indexOf("=") + 1);
+ final String prop = arg.substring(arg.indexOf("-D") + 2, arg.indexOf('='));
+ final String val = arg.substring(arg.indexOf('=') + 1);
JavaSecurityManagers.setSystemProperty(prop, val);
}
@@ -188,7 +188,7 @@ public class MainImpl implements Main {
// Now read in and apply the properties specified on the command line
for (final String arg : args) {
final int idx = arg.indexOf("-D");
- final int eq = arg.indexOf("=");
+ final int eq = arg.indexOf('=');
if (idx >= 0 && eq > idx) {
final String prop = arg.substring(idx + 2, eq);
final String val = arg.substring(eq + 1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java b/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
index c9b768c..5658d5d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
@@ -208,7 +208,7 @@ public class InitEjbDeployments implements DynamicDeployer {
// we don't have the ejb class object (only the string name) so we have
// to extract the simple name from the FQN of the class
- final int simpleNameIdx = bean.getEjbClass().lastIndexOf(".");
+ final int simpleNameIdx = bean.getEjbClass().lastIndexOf('.');
contextData.put("ejbClass.simpleName", bean.getEjbClass().substring(simpleNameIdx + 1));
contextData.put("ejbName", bean.getEjbName());
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/config/QuickServerXmlParser.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/QuickServerXmlParser.java b/container/openejb-core/src/main/java/org/apache/openejb/config/QuickServerXmlParser.java
index df68658..1cae67e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/QuickServerXmlParser.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/QuickServerXmlParser.java
@@ -78,7 +78,7 @@ public class QuickServerXmlParser extends DefaultHandler {
if (protocol == null) {
protocol = DEFAULT_CONNECTOR_KEY;
} else if (protocol.contains("/")) {
- protocol = protocol.substring(0, protocol.indexOf("/"));
+ protocol = protocol.substring(0, protocol.indexOf('/'));
}
final String port = attributes.getValue("port");
final String ssl = attributes.getValue("secure");
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
index 45eb971..170966b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
@@ -237,12 +237,12 @@ public class ServiceUtils {
String providerName = null;
String serviceName = null;
- if (id.indexOf("#") != -1) {
- providerName = id.substring(0, id.indexOf("#"));
- serviceName = id.substring(id.indexOf("#") + 1);
- } else if (id.indexOf(":") != -1) {
- providerName = id.substring(0, id.indexOf(":"));
- serviceName = id.substring(id.indexOf(":") + 1);
+ if (id.indexOf('#') != -1) {
+ providerName = id.substring(0, id.indexOf('#'));
+ serviceName = id.substring(id.indexOf('#') + 1);
+ } else if (id.indexOf(':') != -1) {
+ providerName = id.substring(0, id.indexOf(':'));
+ serviceName = id.substring(id.indexOf(':') + 1);
} else {
providerName = currentDefaultProviderUrl(DEFAULT_PROVIDER_URL);
serviceName = id;
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
index 0c9eb04..ead5b3f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
@@ -114,7 +114,7 @@ public class IvmContext implements Context, Serializable {
}
final String compoundName;
- final int index = compositName.indexOf(":");
+ final int index = compositName.indexOf(':');
if (index > -1) {
final String prefix = compositName.substring(0, index);
@@ -307,7 +307,7 @@ public class IvmContext implements Context, Serializable {
if(checkReadOnly()) {
return;
}
- final int indx = name.indexOf(":");
+ final int indx = name.indexOf(':');
if (indx > -1) {
/*
The ':' character will be in the path if its an absolute path name starting with the schema
@@ -348,7 +348,7 @@ public class IvmContext implements Context, Serializable {
if(checkReadOnly()) {
return;
}
- final int indx = name.indexOf(":");
+ final int indx = name.indexOf(':');
if (indx > -1) {
/*
The ':' character will be in the path if its an absolute path name starting with the schema
@@ -422,7 +422,7 @@ public class IvmContext implements Context, Serializable {
//TODO: null is fine if there is a one time - 10 calls will log a single time - log line (warning?)
return null;
}
- final int indx = name.indexOf(":");
+ final int indx = name.indexOf(':');
if (indx > -1) {
/*
The ':' character will be in the path if its an absolute path name starting with the schema
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
index 585a3e9..97e2f6e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
@@ -162,7 +162,7 @@ public class EJBCronTrigger extends CronTriggerImpl {
expr = expr.replaceAll("\\s+", "").toUpperCase(Locale.ENGLISH);
- if (expr.length() > 1 && expr.indexOf(",") > 0) {
+ if (expr.length() > 1 && expr.indexOf(',') > 0) {
final String[] expressions = expr.split(",");
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
index 934d5ee..a759bb9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
@@ -124,7 +124,7 @@ public class FailOverRouter extends AbstractRouter {
public Collection<DataSourceHolder> prepare(final Collection<DataSourceHolder> list) {
final int step;
if (strategy.contains("%")) {
- step = Math.max(1, Integer.parseInt(strategy.substring(strategy.lastIndexOf("%") + 1)));
+ step = Math.max(1, Integer.parseInt(strategy.substring(strategy.lastIndexOf('%') + 1)));
} else {
step = 1;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
index 65ac86e..e833805 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
@@ -230,7 +230,7 @@ public class AnnotationFinder {
private static List<String> jar(final URL location) throws IOException, URISyntaxException {
String jarPath = location.getFile();
if (jarPath.contains("!")) {
- jarPath = jarPath.substring(0, jarPath.indexOf("!"));
+ jarPath = jarPath.substring(0, jarPath.indexOf('!'));
}
final URL url = new URL(jarPath);
if ("file".equals(url.getProtocol())) { // ZipFile is faster than ZipInputStream
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java b/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
index 1f0a16e..6815e41 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/IntrospectionSupport.java
@@ -262,7 +262,7 @@ public class IntrospectionSupport {
public static String simpleName(final Class clazz) {
String name = clazz.getName();
- final int p = name.lastIndexOf(".");
+ final int p = name.lastIndexOf('.');
if (p >= 0) {
name = name.substring(p + 1);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
index 640a064..e7cb77c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
@@ -216,7 +216,7 @@ public class Logger {
private static final Computable<String, String> heirarchyResolver = new Computable<String, String>() {
@Override
public String compute(final String key) throws InterruptedException {
- final int index = key.lastIndexOf(".");
+ final int index = key.lastIndexOf('.');
final String parent = key.substring(0, index);
if (parent.contains(OPENEJB)) {
return parent;
@@ -318,7 +318,7 @@ public class Logger {
private static String packageName(final Class clazz) {
final String name = clazz.getName();
- return name.substring(0, name.lastIndexOf("."));
+ return name.substring(0, name.lastIndexOf('.'));
}
private static Boolean isLog4j;
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
index ddaf1b0..ef7f835 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
@@ -43,7 +43,7 @@ public class Messages {
private static String packageName(final Class clazz) {
final String name = clazz.getName();
- return name.substring(0, name.lastIndexOf("."));
+ return name.substring(0, name.lastIndexOf('.'));
}
public Messages(final String resourceName) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java b/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
index bb2c6cb..829327b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/URISupport.java
@@ -172,7 +172,7 @@ public class URISupport {
if (uri != null) {
final String[] parameters = uri.split("&");
for (int i = 0; i < parameters.length; i++) {
- final int p = parameters[i].indexOf("=");
+ final int p = parameters[i].indexOf('=');
if (p >= 0) {
final String name = URLDecoder.decode(parameters[i].substring(0, p), "UTF-8");
final String value = URLDecoder.decode(parameters[i].substring(p + 1), "UTF-8");
@@ -227,15 +227,15 @@ public class URISupport {
}
int p;
- final int intialParen = ssp.indexOf("(");
+ final int intialParen = ssp.indexOf('(');
if (intialParen == 0) {
rc.host = ssp.substring(0, intialParen);
- p = rc.host.indexOf("/");
+ p = rc.host.indexOf('/');
if (p >= 0) {
rc.path = rc.host.substring(p);
rc.host = rc.host.substring(0, p);
}
- p = ssp.lastIndexOf(")");
+ p = ssp.lastIndexOf(')');
componentString = ssp.substring(intialParen + 1, p);
params = ssp.substring(p + 1).trim();
@@ -250,7 +250,7 @@ public class URISupport {
rc.components[i] = new URI(components[i].trim());
}
- p = params.indexOf("?");
+ p = params.indexOf('?');
if (p >= 0) {
if (p > 0) {
rc.path = stripPrefix(params.substring(0, p), "/");
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java b/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
index fd8a35a..83e3cca 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
@@ -74,7 +74,7 @@ public class UpdateChecker {
final String userInfo = proxyUrl.getUserInfo();
if (userInfo != null) {
- final int sep = userInfo.indexOf(":");
+ final int sep = userInfo.indexOf(':');
if (sep >= 0) {
JavaSecurityManagers.setSystemProperty(proxyProtocol + ".proxyUser", userInfo.substring(0, sep));
JavaSecurityManagers.setSystemProperty(proxyProtocol + ".proxyPassword", userInfo.substring(sep + 1));
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java b/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
index 25c20a1..e532d41 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
@@ -202,7 +202,7 @@ public class UrlCache {
// generate a nice cache file name
final String name = sourceFile.getName();
- final int dot = name.lastIndexOf(".");
+ final int dot = name.lastIndexOf('.');
String prefix = name;
String suffix = "";
if (dot > 0) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
index 07667ad..551d435 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
@@ -676,7 +676,7 @@ public class LocalBeanProxyFactory implements Opcodes {
String className = parameterType.getCanonicalName();
if (parameterType.isMemberClass()) {
- final int lastDot = className.lastIndexOf(".");
+ final int lastDot = className.lastIndexOf('.');
className = className.substring(0, lastDot) + "$" + className.substring(lastDot + 1);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
index 2c72a19..9a869c3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/web/LightweightWebAppBuilder.java
@@ -432,7 +432,7 @@ public class LightweightWebAppBuilder implements WebAppBuilder {
try { // in WEB-INF/classes
return loader.loadClass(className(classname));
} catch (final ClassNotFoundException cnfe) { // in a dependency (jar)
- return loader.loadClass(className(path.substring(path.indexOf("!") + 2)));
+ return loader.loadClass(className(path.substring(path.indexOf('!') + 2)));
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
index 843e22f..dca0411 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
@@ -161,7 +161,7 @@ public class ValidationKeysAuditorTest {
private String createConfluenceLink(final String string) {
String link = "[" + string + " | ";
- final String temp = string.substring(0, string.lastIndexOf("."));
+ final String temp = string.substring(0, string.lastIndexOf('.'));
final String location = "https://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/" + temp + ".java?revision=HEAD&view=markup ]";
link = link + location;
return link;
@@ -302,7 +302,7 @@ public class ValidationKeysAuditorTest {
private static Set<String> stripPrefixes(final Set<String> allKeys) {
final Set<String> keys = new HashSet<>();
for (String key : allKeys) {
- key = key.substring(key.indexOf(".") + 1);
+ key = key.substring(key.indexOf('.') + 1);
if (!keys.contains(key))
keys.add(key);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java
----------------------------------------------------------------------
diff --git a/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java b/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java
index 092fbc1..9e18a41 100644
--- a/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java
+++ b/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java
@@ -170,7 +170,7 @@ public class Agent {
final RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
String pid = bean.getName();
if (pid.contains("@")) {
- pid = pid.substring(0, pid.indexOf("@"));
+ pid = pid.substring(0, pid.indexOf('@'));
}
return pid;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChainsStringQNameAdapter.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChainsStringQNameAdapter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChainsStringQNameAdapter.java
index 294286f..3f5f91e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChainsStringQNameAdapter.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/HandlerChainsStringQNameAdapter.java
@@ -37,7 +37,7 @@ public class HandlerChainsStringQNameAdapter extends XmlAdapter<String, QName> {
if (value == null || value.isEmpty()) {
return new QName(XMLConstants.NULL_NS_URI, "");
}
- final int colonIndex = value.indexOf(":");
+ final int colonIndex = value.indexOf(':');
if (colonIndex == -1) {
return new QName(XMLConstants.NULL_NS_URI, value);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe2c486/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
index 2f8c60d..3f82993 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
@@ -115,7 +115,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
// try first locally
} else {
- final int repoIdx = raw.lastIndexOf("!");
+ final int repoIdx = raw.lastIndexOf('!');
toParse = raw.substring(repoIdx + 1);
}
[4/9] tomee git commit: TOMEE-2328 - Make artifact id match folder
and parent module name
Posted by jl...@apache.org.
TOMEE-2328 - Make artifact id match folder and parent module name
Signed-off-by: brunobat <br...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5baf0be6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5baf0be6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5baf0be6
Branch: refs/heads/master
Commit: 5baf0be677bd336636014861313bef65463bfe88
Parents: 8d5fb63
Author: brunobat <br...@gmail.com>
Authored: Fri Dec 7 11:07:09 2018 +0000
Committer: brunobat <br...@gmail.com>
Committed: Fri Dec 7 11:07:09 2018 +0000
----------------------------------------------------------------------
examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +-
examples/ear-testing/business-logic/pom.xml | 2 +-
examples/ear-testing/business-model/pom.xml | 2 +-
examples/ear-testing/pom.xml | 2 +-
examples/javamail/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5baf0be6/examples/applicationcomposer-jaxws-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/pom.xml b/examples/applicationcomposer-jaxws-cdi/pom.xml
index 58bf5d3..f8c9ced 100644
--- a/examples/applicationcomposer-jaxws-cdi/pom.xml
+++ b/examples/applicationcomposer-jaxws-cdi/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
- <artifactId>ws-pojo-cdi</artifactId>
+ <artifactId>applicationcomposer-jaxws-cdi</artifactId>
<version>8.0.0-SNAPSHOT</version>
<name>OpenEJB :: Examples :: Application Composer, JAX-WS and CDI are in a boat</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/5baf0be6/examples/ear-testing/business-logic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml
index 0600f59..d2b5175 100644
--- a/examples/ear-testing/business-logic/pom.xml
+++ b/examples/ear-testing/business-logic/pom.xml
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.superbiz</groupId>
- <artifactId>myear</artifactId>
+ <artifactId>ear-testing</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/5baf0be6/examples/ear-testing/business-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ear-testing/business-model/pom.xml b/examples/ear-testing/business-model/pom.xml
index 404b8a2..9d3ae4c 100644
--- a/examples/ear-testing/business-model/pom.xml
+++ b/examples/ear-testing/business-model/pom.xml
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.superbiz</groupId>
- <artifactId>myear</artifactId>
+ <artifactId>ear-testing</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/5baf0be6/examples/ear-testing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml
index 4751b12..e5af87a 100644
--- a/examples/ear-testing/pom.xml
+++ b/examples/ear-testing/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
- <artifactId>myear</artifactId>
+ <artifactId>ear-testing</artifactId>
<version>8.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: Examples :: Ear Testing</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/5baf0be6/examples/javamail/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javamail/pom.xml b/examples/javamail/pom.xml
index 593eb0d..28f8f3b 100644
--- a/examples/javamail/pom.xml
+++ b/examples/javamail/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
- <artifactId>javamail-api</artifactId>
+ <artifactId>javamail</artifactId>
<version>8.0.0-SNAPSHOT</version>
<name>OpenEJB :: Examples :: JavaMail API</name>
[2/9] tomee git commit: TOMEE-2328 - remove parent and fix build
after that - mp-metrics-timed
Posted by jl...@apache.org.
TOMEE-2328 - remove parent and fix build after that - mp-metrics-timed
Signed-off-by: brunobat <br...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/368abd9e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/368abd9e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/368abd9e
Branch: refs/heads/master
Commit: 368abd9ec52dacad793b0c486cd9b1c9fdd405fd
Parents: 457035e
Author: brunobat <br...@gmail.com>
Authored: Fri Dec 7 10:42:50 2018 +0000
Committer: brunobat <br...@gmail.com>
Committed: Fri Dec 7 10:42:50 2018 +0000
----------------------------------------------------------------------
examples/mp-metrics-timed/pom.xml | 35 +++++++++++++++-----
.../src/main/webapp/WEB-INF/web.xml | 25 ++++++++++++++
2 files changed, 52 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/368abd9e/examples/mp-metrics-timed/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-timed/pom.xml b/examples/mp-metrics-timed/pom.xml
index 88fcd30..29082eb 100644
--- a/examples/mp-metrics-timed/pom.xml
+++ b/examples/mp-metrics-timed/pom.xml
@@ -19,32 +19,42 @@
<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>examples</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>8.0.0-SNAPSHOT</version>
- </parent>
+
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz</groupId>
<artifactId>mp-metrics-timed</artifactId>
-
+ <version>8.0.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <name>OpenEJB :: Examples :: Microprofile Metrics Timed</name>
+ <properties>
+ <version.javaee-api>8.0</version.javaee-api>
+ <microprofile.metrics.version>1.1</microprofile.metrics.version>
+ <tomee.version>${project.version}</tomee.version>
+ <junit.version>4.12</junit.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0</version>
+ <version>${version.javaee-api}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
- <version>1.0</version>
+ <version>${microprofile.metrics.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-cxf-rs</artifactId>
<version>${tomee.version}</version>
@@ -83,6 +93,15 @@
<context>${project.artifactId}</context>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/368abd9e/examples/mp-metrics-timed/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-timed/src/main/webapp/WEB-INF/web.xml b/examples/mp-metrics-timed/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..a4b8847
--- /dev/null
+++ b/examples/mp-metrics-timed/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false"
+ version="2.5">
+
+ <display-name>Microprofile Metrics Timed</display-name>
+</web-app>
[9/9] tomee git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tomee
Posted by jl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9098aafe
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9098aafe
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9098aafe
Branch: refs/heads/master
Commit: 9098aafec368caa7c6534e497b2fb3e6136f6acf
Parents: 983f68b 326832e
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Mon Dec 10 14:21:32 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Mon Dec 10 14:21:32 2018 +0100
----------------------------------------------------------------------
.../arquillian/remote/RemoteTomEEContainer.java | 3 +
docs/Configuring-in-tomee.adoc | 14 +-
docs/activemqresourceadapter-config.adoc | 12 +-
docs/admin/cluster/index.adoc | 22 +-
docs/admin/configuration/application.adoc | 16 +-
docs/admin/configuration/containers.adoc | 100 ++++----
docs/admin/configuration/index.adoc | 4 +-
docs/admin/configuration/resources.adoc | 128 +++++-----
docs/admin/configuration/server.adoc | 4 +-
docs/admin/index.adoc | 2 +-
docs/advanced/client/jndi.adoc | 23 +-
docs/advanced/index.adoc | 2 +-
docs/advanced/jms/jms-configuration.adoc | 4 +-
docs/advanced/setup/index.adoc | 9 +-
docs/advanced/shading/index.adoc | 4 +-
docs/advanced/tomee-embedded/index.adoc | 4 +-
docs/alternate-descriptors.adoc | 21 +-
docs/annotations,-xml-and-defaults.adoc | 12 +-
docs/app-clients-and-jndi.adoc | 2 +-
docs/application-composer/advanced.adoc | 44 ++--
docs/application-composer/getting-started.adoc | 69 +++---
docs/application-composer/history.adoc | 10 +-
docs/application-composer/index.adoc | 2 +-
docs/application-deployment-solutions.adoc | 14 +-
...application-discovery-via-the-classpath.adoc | 24 +-
docs/application-resources.adoc | 67 +++--
docs/arquillian-available-adapters.adoc | 42 ++--
docs/arquillian-getting-started.adoc | 2 +-
docs/basics---getting-things.adoc | 4 +-
docs/basics---security.adoc | 7 +-
docs/basics---transactions.adoc | 2 +-
docs/bmpentitycontainer-config.adoc | 12 +-
docs/bouncy-castle.adoc | 7 +-
docs/built-in-type-converters.adoc | 17 +-
docs/callbacks.adoc | 22 +-
docs/changing-jms-implementations.adoc | 17 +-
docs/client-server-transports.adoc | 4 +-
docs/clients.adoc | 48 ++--
docs/cmpentitycontainer-config.adoc | 12 +-
docs/collapsed-ear.adoc | 8 +-
docs/common-datasource-configurations.adoc | 39 +--
docs/common-errors.adoc | 2 +-
docs/common-persistenceprovider-properties.adoc | 23 +-
docs/comparison.adoc | 2 +-
docs/concepts.adoc | 2 +-
docs/configuration.adoc | 24 +-
docs/configuring-containers-in-tests.adoc | 7 +-
docs/configuring-datasources-in-tests.adoc | 17 +-
docs/configuring-datasources.adoc | 72 +++---
docs/configuring-durations.adoc | 7 +-
docs/configuring-javamail.adoc | 14 +-
docs/configuring-logging-in-tests.adoc | 18 +-
docs/configuring-persistenceunits-in-tests.adoc | 19 +-
docs/constructor-injection.adoc | 17 +-
docs/containers-and-resources.adoc | 7 +-
docs/contrib/debug/debug-intellij.adoc | 18 +-
docs/custom-injection.adoc | 34 +--
docs/datasource-config.adoc | 42 ++--
docs/datasource-configuration-by-creator.adoc | 2 +-
docs/datasource-password-encryption.adoc | 51 ++--
docs/deamon/lin-service.adoc | 2 +-
docs/deamon/win-service.adoc | 2 +-
docs/declaring-references.adoc | 3 +-
docs/deploy-tool.adoc | 21 +-
docs/deploying-in-tomee.adoc | 6 +-
docs/deployment-id.adoc | 33 +--
docs/deployments.adoc | 39 +--
docs/details-on-openejb-jar.adoc | 36 +--
docs/developer/classloading/index.adoc | 1 -
docs/developer/ide/index.adoc | 8 +-
docs/developer/index.adoc | 2 +-
docs/developer/json/index.adoc | 3 +-
.../testing/applicationcomposer/index.adoc | 50 ++--
docs/developer/testing/arquillian/index.adoc | 24 +-
docs/developer/testing/other/index.adoc | 10 +-
docs/developer/tools/gradle-plugins.adoc | 2 +-
.../tools/maven/applicationcomposer.adoc | 8 +-
docs/developer/tools/maven/embedded.adoc | 2 +-
docs/developer/tools/maven/tomee.adoc | 18 +-
docs/docs.adoc | 8 +-
docs/documentation.adoc | 6 +-
docs/documentation.old.adoc | 4 +-
docs/dynamic-datasource.adoc | 31 ++-
docs/eclipse-plugin.adoc | 12 +-
docs/ejb-failover.adoc | 4 +-
docs/ejb-local-ref.adoc | 18 +-
docs/ejb-over-ssl.adoc | 27 +-
docs/ejb-ref.adoc | 18 +-
docs/ejb-refs.adoc | 49 ++--
docs/ejb-request-logging.adoc | 19 +-
docs/ejbd-transport.adoc | 37 +--
docs/embedded-and-remotable.adoc | 22 +-
docs/embedded-configuration.adoc | 37 +--
docs/embedding.adoc | 2 +-
docs/failover-logging.adoc | 25 +-
docs/faq.adoc | 19 +-
docs/features.adoc | 3 +-
docs/from-glassfish-to-tomee.adoc | 2 +-
...esting-with-openejb,-jetty-and-selenium.adoc | 247 +++++++++----------
docs/generating-ejb-3-annotations.adoc | 16 +-
docs/getting-started.adoc | 60 +++--
docs/hello-world.adoc | 84 ++++---
docs/hibernate.adoc | 14 +-
docs/initialcontext-config.adoc | 12 +-
docs/installation-drop-in-war.adoc | 7 +-
docs/installation.adoc | 4 +-
docs/installing-tomee.adoc | 22 +-
docs/java7.adoc | 2 +-
docs/javaagent-with-maven-surefire.adoc | 17 +-
docs/javaagent.adoc | 14 +-
docs/javaee7-status.adoc | 2 +-
docs/javamailsession-config.adoc | 12 +-
docs/jms-resources-and-mdb-container.adoc | 32 ++-
docs/jmsconnectionfactory-config.adoc | 12 +-
docs/jndi-names.adoc | 67 ++---
docs/jpa-concepts.adoc | 24 +-
docs/jpa-usage.adoc | 4 +-
docs/local-client-injection.adoc | 11 +-
docs/local-server.adoc | 6 +-
docs/lookup-of-other-ejbs-example.adoc | 22 +-
docs/managedcontainer-config.adoc | 12 +-
docs/manual-installation.adoc | 21 +-
docs/maven.adoc | 12 +-
docs/maven/index.adoc | 19 +-
docs/messagedrivencontainer-config.adoc | 12 +-
docs/multicast-discovery.adoc | 17 +-
docs/multiple-business-interface-hazzards.adoc | 51 ++--
docs/multipoint-considerations.adoc | 2 +-
docs/multipoint-discovery.adoc | 17 +-
docs/multipoint-recommendations.adoc | 7 +-
docs/multipulse-discovery.adoc | 22 +-
docs/new-in-openejb-3.0.adoc | 24 +-
docs/openejb-3.adoc | 10 +-
docs/openejb-binaries.adoc | 14 +-
docs/openejb-eclipse-plugin.adoc | 8 +-
docs/openejb-jsr-107-integration.adoc | 10 +-
docs/openejb.xml.adoc | 20 +-
docs/openjpa.adoc | 37 +--
docs/orb-config.adoc | 12 +-
docs/persistence-context.adoc | 16 +-
docs/persistence-unit-ref.adoc | 26 +-
docs/properties-listing.adoc | 2 +-
docs/properties-tool.adoc | 13 +-
docs/property-overriding.adoc | 4 +-
docs/provisioning.adoc | 34 +--
docs/proxyfactory-config.adoc | 12 +-
docs/queue-config.adoc | 12 +-
docs/quickstart.adoc | 8 +-
docs/remote-server.adoc | 19 +-
docs/resource-injection.adoc | 60 +++--
docs/resource-ref-for-datasource.adoc | 12 +-
docs/running-a-standalone-openejb-server.adoc | 10 +-
docs/securing-a-web-service.adoc | 39 +--
docs/security-annotations.adoc | 49 ++--
docs/security.adoc | 11 +-
docs/securityservice-config.adoc | 12 +-
docs/service-locator.adoc | 49 ++--
docs/services.adoc | 2 +-
docs/singleton-beans.adoc | 26 +-
docs/singleton-ejb.adoc | 4 +-
docs/singletoncontainer-config.adoc | 12 +-
docs/spring-and-openejb-3.0.adoc | 48 ++--
docs/spring-ejb-and-jpa.adoc | 12 +-
docs/spring.adoc | 12 +-
docs/ssh.adoc | 2 +-
docs/standalone-server.adoc | 2 +-
docs/startup.adoc | 46 ++--
docs/statefulcontainer-config.adoc | 12 +-
docs/statelesscontainer-config.adoc | 22 +-
docs/system-properties-files.adoc | 2 +-
docs/system-properties.adoc | 17 +-
docs/telnet-console.adoc | 45 ++--
docs/tip-concurrency.adoc | 12 +-
docs/tip-jersey-client.adoc | 12 +-
docs/tip-weblogic.adoc | 7 +-
docs/tomcat-object-factory.adoc | 2 +-
docs/tomee-and-eclipse.adoc | 12 +-
docs/tomee-and-hibernate.adoc | 17 +-
docs/tomee-and-intellij.adoc | 2 +-
docs/tomee-and-netbeans.adoc | 4 +-
docs/tomee-and-security.adoc | 14 +-
docs/tomee-and-webspheremq.adoc | 2 +-
docs/tomee-directory-structure.adoc | 2 +-
docs/tomee-embedded-maven-plugin.adoc | 2 +-
docs/tomee-jaas.adoc | 27 +-
docs/tomee-logging-in-eclipse.adoc | 7 +-
docs/tomee-maven-plugin.adoc | 19 +-
docs/tomee-mp-getting-started.adoc | 40 +--
docs/tomee-webapp.adoc | 12 +-
docs/topic-config.adoc | 12 +-
docs/transaction-annotations.adoc | 24 +-
docs/transactionmanager-config.adoc | 12 +-
docs/understanding-callbacks.adoc | 17 +-
docs/understanding-the-directory-layout.adoc | 14 +-
docs/unix-daemon.adoc | 57 +++--
docs/validation-tool.adoc | 17 +-
docs/version-checker.adoc | 2 +-
examples/mp-faulttolerance-retry/pom.xml | 2 +-
examples/mvc-cxf/pom.xml | 8 +
199 files changed, 2163 insertions(+), 1715 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9098aafe/examples/mvc-cxf/pom.xml
----------------------------------------------------------------------
[5/9] tomee git commit: Merge remote-tracking branch
'upstream/master' into fix-examples
Posted by jl...@apache.org.
Merge remote-tracking branch 'upstream/master' into fix-examples
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b5cb42fe
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b5cb42fe
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b5cb42fe
Branch: refs/heads/master
Commit: b5cb42fe4dd64f822708b5e58606f6a1b7ef1aeb
Parents: 5baf0be 2c2b835
Author: brunobat <br...@gmail.com>
Authored: Fri Dec 7 11:23:28 2018 +0000
Committer: brunobat <br...@gmail.com>
Committed: Fri Dec 7 11:23:28 2018 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------