You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/11/07 02:33:39 UTC
[1/2] tomee git commit: PMD
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 6df9839b2 -> d82f8386a
PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/52c796aa
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/52c796aa
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/52c796aa
Branch: refs/heads/tomee-1.7.x
Commit: 52c796aad3ca122c8642a73c83ade55080ba7d2b
Parents: 6df9839
Author: AndyGee <an...@gmx.de>
Authored: Sat Nov 7 02:33:11 2015 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Sat Nov 7 02:33:11 2015 +0100
----------------------------------------------------------------------
.../org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/52c796aa/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
index 3e07e81..738e375 100644
--- a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
+++ b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
@@ -16,7 +16,6 @@
*/
package org.apache.tomee.arquillian.webapp;
-import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.arquillian.common.ArquillianFilterRunner;
import org.apache.openejb.arquillian.common.Files;
import org.apache.openejb.arquillian.common.IO;
[2/2] tomee git commit: PMD
Posted by an...@apache.org.
PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d82f8386
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d82f8386
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d82f8386
Branch: refs/heads/tomee-1.7.x
Commit: d82f8386aad0369ba50dec7b1a7fe7cf80af0f8b
Parents: 52c796a
Author: AndyGee <an...@gmx.de>
Authored: Sat Nov 7 02:33:21 2015 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Sat Nov 7 02:33:21 2015 +0100
----------------------------------------------------------------------
.../arquillian/remote/RemoteTomEEContainer.java | 6 +++---
.../org/apache/tomee/RemoteTomEEEJBContainer.java | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d82f8386/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
index 80e3173..aab4eff 100644
--- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
+++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
@@ -258,9 +258,9 @@ public class RemoteTomEEContainer extends TomEEContainer<RemoteTomEEConfiguratio
final File conf = new File(configuration.getConf());
return !(conf.exists()
- && (new File(conf, "logging.properties").exists()
- || new File(conf, "log4j.properties").exists()
- || new File(conf, "log4j.xml").exists()));
+ && (new File(conf, "logging.properties").exists()
+ || new File(conf, "log4j.properties").exists()
+ || new File(conf, "log4j.xml").exists()));
}
@Override
http://git-wip-us.apache.org/repos/asf/tomee/blob/d82f8386/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java b/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
index 1d30c46..95b8a38 100644
--- a/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
+++ b/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
@@ -5,14 +5,14 @@
* 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.
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.tomee;