You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/28 15:08:39 UTC
svn commit: r1546367 - in /tomee/tomee/trunk/tomee/tomee-catalina: ./
src/main/config/ src/main/config/pmd/
src/main/java/org/apache/tomee/catalina/
src/main/java/org/apache/tomee/catalina/cdi/
Author: tveronezi
Date: Thu Nov 28 14:08:38 2013
New Revision: 1546367
URL: http://svn.apache.org/r1546367
Log:
https://issues.apache.org/jira/browse/TOMEE-1090
Added:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/
tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/
tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-basic.xml
tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-controversial.xml
tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-empty.xml
tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-optimizations.xml
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/pom.xml
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/BackportUtil.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LinkageErrorProtection.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListener.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListeners.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionContextBackedByHttpSession.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionNormalScopeBeanHandler.java
Modified: tomee/tomee/trunk/tomee/tomee-catalina/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/pom.xml?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/pom.xml Thu Nov 28 14:08:38 2013
@@ -19,7 +19,8 @@
<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
-<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">
+<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>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -30,6 +31,15 @@
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: Catalina</name>
<description>This module contains the classes that will be added to the catalina class loader</description>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </reporting>
<build>
<plugins>
<plugin>
@@ -41,6 +51,33 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <linkXRef>true</linkXRef>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <targetJdk>1.6</targetJdk>
+ <rulesets>
+ <ruleset>${project.basedir}/src/main/config/pmd/openejb-empty.xml</ruleset>
+ <ruleset>rulesets/java/finalizers.xml</ruleset>
+ <ruleset>rulesets/java/imports.xml</ruleset>
+ <ruleset>rulesets/java/unusedcode.xml</ruleset>
+ <ruleset>${project.basedir}/src/main/config/pmd/openejb-controversial.xml</ruleset>
+ <ruleset>${project.basedir}/src/main/config/pmd/openejb-basic.xml</ruleset>
+ <ruleset>${project.basedir}/src/main/config/pmd/openejb-optimizations.xml</ruleset>
+ </rulesets>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Added: tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-basic.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-basic.xml?rev=1546367&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-basic.xml (added)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-basic.xml Thu Nov 28 14:08:38 2013
@@ -0,0 +1,38 @@
+<?xml version="1.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.
+
+-->
+<ruleset name="Basic"
+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+ <description>
+ Custom basic.xml for openejb-core
+ </description>
+
+ <!-- All the rules from basic.xml -->
+ <rule ref="rulesets/java/basic.xml">
+ <exclude name="EmptyCatchBlock"/> <!-- This is covered by the openejb-empty.xml file -->
+ <exclude name="CollapsibleIfStatements"/>
+ <exclude name="ReturnFromFinallyBlock"/>
+ <exclude name="AvoidBranchingStatementAsLastInLoop"/>
+ <exclude name="AvoidThreadGroup"/>
+ </rule>
+
+
+</ruleset>
Added: tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-controversial.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-controversial.xml?rev=1546367&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-controversial.xml (added)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-controversial.xml Thu Nov 28 14:08:38 2013
@@ -0,0 +1,46 @@
+<?xml version="1.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.
+
+-->
+<ruleset name="Basic"
+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+ <description>
+ Custom controversial.xml for openejb-core
+ </description>
+
+ <rule ref="rulesets/java/controversial.xml">
+ <exclude name="DataflowAnomalyAnalysis"/>
+ <exclude name="OnlyOneReturn"/>
+ <exclude name="AvoidFinalLocalVariable"/>
+ <exclude name="NullAssignment"/>
+ <exclude name="AvoidLiteralsInIfCondition"/>
+ <exclude name="AtLeastOneConstructor"/>
+ <exclude name="UseConcurrentHashMap"/>
+ <exclude name="AvoidPrefixingMethodParameters"/>
+ <exclude name="CallSuperInConstructor"/>
+ <exclude name="DefaultPackage"/>
+ <exclude name="AvoidUsingShortType"/>
+ <exclude name="UseObjectForClearerAPI"/>
+ <exclude name="AvoidUsingVolatile"/>
+ <exclude name="AssignmentInOperand"/>
+ <exclude name="BooleanInversion"/>
+ </rule>
+
+</ruleset>
Added: tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-empty.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-empty.xml?rev=1546367&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-empty.xml (added)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-empty.xml Thu Nov 28 14:08:38 2013
@@ -0,0 +1,40 @@
+<?xml version="1.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.
+
+-->
+<ruleset name="Basic"
+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+ <description>
+ Custom empty.xml for openejb-core
+ </description>
+
+ <!-- All the rules from empty.xml -->
+ <rule ref="rulesets/java/empty.xml">
+ <exclude name="EmptyCatchBlock"/>
+ </rule>
+
+ <!-- overriding EmptyCatchBlock -->
+ <rule ref="rulesets/java/empty.xml/EmptyCatchBlock">
+ <properties>
+ <property name="allowCommentedBlocks" value="true"/>
+ </properties>
+ </rule>
+
+</ruleset>
Added: tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-optimizations.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-optimizations.xml?rev=1546367&view=auto
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-optimizations.xml (added)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/config/pmd/openejb-optimizations.xml Thu Nov 28 14:08:38 2013
@@ -0,0 +1,41 @@
+<?xml version="1.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.
+
+-->
+<ruleset name="Basic"
+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+ <description>
+ Custom optimizations.xml for openejb-core
+ </description>
+
+ <!-- All the rules from basic.xml -->
+ <rule ref="rulesets/java/optimizations.xml">
+ <exclude name="PrematureDeclaration"/> <!-- this rule is buggy -->
+ <exclude name="AvoidInstantiatingObjectsInLoops"/>
+ <exclude name="MethodArgumentCouldBeFinal"/>
+ <exclude name="LocalVariableCouldBeFinal"/>
+ <exclude name="RedundantFieldInitializer"/>
+ <exclude name="SimplifyStartsWith"/>
+ <exclude name="UseStringBufferForStringAppends"/>
+ <exclude name="AddEmptyString"/>
+ <exclude name="UseArrayListInsteadOfVector"/>
+ </rule>
+
+</ruleset>
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/BackportUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/BackportUtil.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/BackportUtil.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/BackportUtil.java Thu Nov 28 14:08:38 2013
@@ -80,7 +80,7 @@ public class BackportUtil {
getAPI().removeService(namingContextListener, serviceName);
}
- public static interface API {
+ public interface API {
Servlet getServlet(Wrapper wrapper);
String findServiceName(NamingResources naming, String refName);
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ContextValue.java Thu Nov 28 14:08:38 2013
@@ -16,11 +16,12 @@
*/
package org.apache.tomee.catalina;
-import java.util.Collection;
-import java.util.TreeSet;
+import org.apache.openejb.core.ThreadContext;
+
import javax.naming.LinkRef;
import javax.naming.NamingException;
-import org.apache.openejb.core.ThreadContext;
+import java.util.Collection;
+import java.util.TreeSet;
public class ContextValue extends LinkRef {
public static final String MODULES_PREFIX = "openejb/modules/";
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/GlobalListenerSupport.java Thu Nov 28 14:08:38 2013
@@ -315,8 +315,9 @@ public class GlobalListenerSupport imple
*
* @param context tomcat context
*/
- @SuppressWarnings({"UnusedDeclaration"})
+ @SuppressWarnings({"UnusedDeclaration", "PMD.UnusedFormalParameter"})
private void contextRemoved(StandardContext context) {
+ // TODO what to do?
}
/**
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java Thu Nov 28 14:08:38 2013
@@ -16,10 +16,11 @@
*/
package org.apache.tomee.catalina;
-import org.apache.catalina.core.StandardContext;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.WebContext;
import org.apache.tomcat.InstanceManager;
+import org.apache.webbeans.exception.WebBeansConfigurationException;
+import org.apache.webbeans.exception.WebBeansCreationException;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -27,8 +28,6 @@ import javax.naming.NamingException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.exception.WebBeansCreationException;
/**
* @version $Rev$ $Date$
@@ -36,11 +35,9 @@ import org.apache.webbeans.exception.Web
public class JavaeeInstanceManager implements InstanceManager {
private final WebContext webContext;
- private final StandardContext context;
- public JavaeeInstanceManager(WebContext webContext, StandardContext context) {
+ public JavaeeInstanceManager(WebContext webContext) {
this.webContext = webContext;
- this.context = context;
}
@Override
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java Thu Nov 28 14:08:38 2013
@@ -16,7 +16,6 @@
*/
package org.apache.tomee.catalina;
-import java.beans.PropertyChangeListener;
import org.apache.catalina.Container;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
@@ -24,6 +23,8 @@ import org.apache.catalina.LifecycleList
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Loader;
+import java.beans.PropertyChangeListener;
+
public class LazyStopLoader implements Loader, Lifecycle {
private final Loader delegate;
private ClassLoader classLoader;
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Thu Nov 28 14:08:38 2013
@@ -211,6 +211,14 @@ public class LazyStopWebappClassLoader e
}
@Override
+ public int hashCode() {
+ int result = (restarting ? 1 : 0);
+ result = 31 * result + (forceStopPhase ? 1 : 0);
+ result = 31 * result + (configurer != null ? configurer.hashCode() : 0);
+ return result;
+ }
+
+ @Override
public String toString() {
return "LazyStop" + super.toString();
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LinkageErrorProtection.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LinkageErrorProtection.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LinkageErrorProtection.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LinkageErrorProtection.java Thu Nov 28 14:08:38 2013
@@ -94,6 +94,7 @@ public class LinkageErrorProtection {
try {
load(className, standardContext);
} catch (Throwable e) {
+ // no-op
}
}
} catch (Throwable e) {
@@ -106,10 +107,12 @@ public class LinkageErrorProtection {
try {
classLoader.loadClass(className);
} catch (ClassNotFoundException e) {
+ // no-op
} catch (LinkageError e) {
try {
classLoader.loadClass(className);
} catch (ClassNotFoundException e2) {
+ // no-op
}
}
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContext.java Thu Nov 28 14:08:38 2013
@@ -39,13 +39,6 @@ import java.util.Hashtable;
public class OpenEJBContext implements Context {
/**
- * Default constructor.
- */
- public OpenEJBContext() {
- super();
- }
-
- /**
* {@inheritDoc}
*/
public Object lookup(Name name) throws NamingException {
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java Thu Nov 28 14:08:38 2013
@@ -17,12 +17,18 @@
*/
package org.apache.tomee.catalina;
-import javax.naming.NameAlreadyBoundException;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.deploy.*;
+import org.apache.catalina.deploy.ContextEjb;
+import org.apache.catalina.deploy.ContextEnvironment;
+import org.apache.catalina.deploy.ContextLocalEjb;
+import org.apache.catalina.deploy.ContextResource;
+import org.apache.catalina.deploy.ContextResourceEnvRef;
+import org.apache.catalina.deploy.ContextResourceLink;
+import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.ResourceBase;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ResourceInfo;
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java Thu Nov 28 14:08:38 2013
@@ -89,25 +89,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import static org.apache.tomee.common.EnumFactory.ENUM_VALUE;
-import static org.apache.tomee.common.NamingUtil.COMPONENT_TYPE;
-import static org.apache.tomee.common.NamingUtil.DEPLOYMENT_ID;
-import static org.apache.tomee.common.NamingUtil.EXTENDED;
-import static org.apache.tomee.common.NamingUtil.EXTERNAL;
-import static org.apache.tomee.common.NamingUtil.JNDI_NAME;
-import static org.apache.tomee.common.NamingUtil.JNDI_PROVIDER_ID;
-import static org.apache.tomee.common.NamingUtil.LOCAL;
-import static org.apache.tomee.common.NamingUtil.LOCALBEAN;
-import static org.apache.tomee.common.NamingUtil.NAME;
-import static org.apache.tomee.common.NamingUtil.RESOURCE_ID;
-import static org.apache.tomee.common.NamingUtil.UNIT;
-import static org.apache.tomee.common.NamingUtil.WSDL_URL;
-import static org.apache.tomee.common.NamingUtil.WS_CLASS;
-import static org.apache.tomee.common.NamingUtil.WS_ID;
-import static org.apache.tomee.common.NamingUtil.WS_PORT_QNAME;
-import static org.apache.tomee.common.NamingUtil.WS_QNAME;
-import static org.apache.tomee.common.NamingUtil.setStaticValue;
-
public class TomcatJndiBuilder {
private final StandardContext standardContext;
private final WebAppInfo webAppInfo;
@@ -170,7 +151,7 @@ public class TomcatJndiBuilder {
}
public static void mergeJava(StandardContext standardContext) {
- ContainerSystem cs = SystemInstance.get().getComponent(org.apache.openejb.spi.ContainerSystem.class);
+ ContainerSystem cs = SystemInstance.get().getComponent(ContainerSystem.class);
ContextAccessController.setWritable(standardContext.getNamingContextListener().getName(), standardContext);
Context root = null;
try {
@@ -360,7 +341,7 @@ public class TomcatJndiBuilder {
resourceEnv.setName(ref.referenceName.replaceAll("^comp/env/", ""));
resourceEnv.setProperty(Constants.FACTORY, ResourceFactory.class.getName());
resourceEnv.setType(ref.type);
- resourceEnv.setProperty(RESOURCE_ID, ref.value);
+ resourceEnv.setProperty(NamingUtil.RESOURCE_ID, ref.value);
resourceEnv.setOverride(false);
naming.addResourceEnvRef(resourceEnv);
@@ -376,7 +357,7 @@ public class TomcatJndiBuilder {
final ContextResourceEnvRef enumRef = new ContextResourceEnvRef();
enumRef.setName(ref.referenceName.replaceAll("^comp/env/", ""));
enumRef.setProperty(Constants.FACTORY, EnumFactory.class.getName());
- enumRef.setProperty(ENUM_VALUE, ref.value);
+ enumRef.setProperty(EnumFactory.ENUM_VALUE, ref.value);
enumRef.setType(ref.type);
enumRef.setOverride(false);
naming.addResourceEnvRef(enumRef);
@@ -422,7 +403,7 @@ public class TomcatJndiBuilder {
lookup.setName(ref.referenceName.replaceAll("^comp/env/", ""));
lookup.setProperty(Constants.FACTORY, LookupFactory.class.getName());
- lookup.setProperty(JNDI_NAME, ref.location.jndiName);
+ lookup.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
lookup.setType(Object.class.getName());
lookup.setOverride(false);
@@ -443,22 +424,22 @@ public class TomcatJndiBuilder {
}
ejb.setProperty(Constants.FACTORY, EjbFactory.class.getName());
- ejb.setProperty(NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ ejb.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
ejb.setHome(ref.homeClassName);
ejb.setRemote(ref.interfaceClassName);
ejb.setLink(null);
ejb.setType(ref.interfaceClassName);
if (useCrossClassLoaderRef) {
- ejb.setProperty(EXTERNAL, "" + ref.externalReference);
+ ejb.setProperty(NamingUtil.EXTERNAL, "" + ref.externalReference);
}
if (ref.ejbDeploymentId != null) {
- ejb.setProperty(DEPLOYMENT_ID, ref.ejbDeploymentId);
+ ejb.setProperty(NamingUtil.DEPLOYMENT_ID, ref.ejbDeploymentId);
}
if (ref.location != null) {
- ejb.setProperty(JNDI_NAME, ref.location.jndiName);
- ejb.setProperty(JNDI_PROVIDER_ID, ref.location.jndiProviderId);
+ ejb.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
+ ejb.setProperty(NamingUtil.JNDI_PROVIDER_ID, ref.location.jndiProviderId);
}
if (addEntry) {
@@ -486,20 +467,20 @@ public class TomcatJndiBuilder {
}
ejb.setProperty(Constants.FACTORY, EjbFactory.class.getName());
- ejb.setProperty(NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ ejb.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
ejb.setHome(ref.homeClassName);
ejb.setRemote(null);
- ejb.setProperty(ref.localbean ? LOCALBEAN : LOCAL, ref.interfaceClassName);
+ ejb.setProperty(ref.localbean ? NamingUtil.LOCALBEAN : NamingUtil.LOCAL, ref.interfaceClassName);
ejb.setLink(null);
ejb.setType(ref.interfaceClassName);
if (ref.ejbDeploymentId != null) {
- ejb.setProperty(DEPLOYMENT_ID, ref.ejbDeploymentId);
+ ejb.setProperty(NamingUtil.DEPLOYMENT_ID, ref.ejbDeploymentId);
}
if (ref.location != null) {
- ejb.setProperty(JNDI_NAME, ref.location.jndiName);
- ejb.setProperty(JNDI_PROVIDER_ID, ref.location.jndiProviderId);
+ ejb.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
+ ejb.setProperty(NamingUtil.JNDI_PROVIDER_ID, ref.location.jndiProviderId);
}
if (addEntry) {
@@ -527,20 +508,17 @@ public class TomcatJndiBuilder {
}
resource.setProperty(Constants.FACTORY, PersistenceContextFactory.class.getName());
- resource.setProperty(NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ resource.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
resource.setType(EntityManager.class.getName());
if (ref.persistenceUnitName != null) {
- resource.setProperty(UNIT, ref.persistenceUnitName);
- }
- resource.setProperty(EXTENDED, "" + ref.extended);
- if (ref.properties != null) {
- // resource.setProperty(NamingConstants.PROPERTIES, ref.properties);
+ resource.setProperty(NamingUtil.UNIT, ref.persistenceUnitName);
}
+ resource.setProperty(NamingUtil.EXTENDED, "" + ref.extended);
if (ref.location != null) {
- resource.setProperty(JNDI_NAME, ref.location.jndiName);
- resource.setProperty(JNDI_PROVIDER_ID, ref.location.jndiProviderId);
+ resource.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
+ resource.setProperty(NamingUtil.JNDI_PROVIDER_ID, ref.location.jndiProviderId);
} else {
Context context = SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext();
EntityManagerFactory factory;
@@ -579,16 +557,16 @@ public class TomcatJndiBuilder {
}
resource.setProperty(Constants.FACTORY, PersistenceUnitFactory.class.getName());
- resource.setProperty(NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ resource.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
resource.setType(EntityManagerFactory.class.getName());
if (ref.persistenceUnitName != null) {
- resource.setProperty(UNIT, ref.persistenceUnitName);
+ resource.setProperty(NamingUtil.UNIT, ref.persistenceUnitName);
}
if (ref.location != null) {
- resource.setProperty(JNDI_NAME, ref.location.jndiName);
- resource.setProperty(JNDI_PROVIDER_ID, ref.location.jndiProviderId);
+ resource.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
+ resource.setProperty(NamingUtil.JNDI_PROVIDER_ID, ref.location.jndiProviderId);
} else {
// TODO: This will not work if webapps don't use AutoConfi
Context context = SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext();
@@ -625,21 +603,17 @@ public class TomcatJndiBuilder {
}
resource.setProperty(Constants.FACTORY, ResourceFactory.class.getName());
- resource.setProperty(NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ resource.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
resource.setType(ref.referenceType);
resource.setAuth(ref.referenceAuth);
if (ref.resourceID != null) {
- resource.setProperty(RESOURCE_ID, ref.resourceID);
- }
-
- if (ref.properties != null) {
- // resource.setProperty(NamingConstants.PROPERTIES, ref.properties);
+ resource.setProperty(NamingUtil.RESOURCE_ID, ref.resourceID);
}
if (ref.location != null) {
- resource.setProperty(JNDI_NAME, ref.location.jndiName);
- resource.setProperty(JNDI_PROVIDER_ID, ref.location.jndiProviderId);
+ resource.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
+ resource.setProperty(NamingUtil.JNDI_PROVIDER_ID, ref.location.jndiProviderId);
}
if (addEntry) {
@@ -670,27 +644,27 @@ public class TomcatJndiBuilder {
resourceEnv.setProperty(Constants.FACTORY, UserTransactionFactory.class.getName());
} else if (TransactionManager.class.getName().equals(ref.resourceEnvRefType)) {
resourceEnv.setProperty(Constants.FACTORY, SystemComponentFactory.class.getName());
- resourceEnv.setProperty(COMPONENT_TYPE, TransactionManager.class.getName());
+ resourceEnv.setProperty(NamingUtil.COMPONENT_TYPE, TransactionManager.class.getName());
} else if (TransactionSynchronizationRegistry.class.getName().equals(ref.resourceEnvRefType)) {
resourceEnv.setProperty(Constants.FACTORY, SystemComponentFactory.class.getName());
- resourceEnv.setProperty(COMPONENT_TYPE, TransactionSynchronizationRegistry.class.getName());
+ resourceEnv.setProperty(NamingUtil.COMPONENT_TYPE, TransactionSynchronizationRegistry.class.getName());
} else if (ORB.class.getName().equals(ref.resourceEnvRefType)) {
resourceEnv.setProperty(Constants.FACTORY, SystemComponentFactory.class.getName());
- resourceEnv.setProperty(COMPONENT_TYPE, ORB.class.getName());
+ resourceEnv.setProperty(NamingUtil.COMPONENT_TYPE, ORB.class.getName());
} else if (HandleDelegate.class.getName().equals(ref.resourceEnvRefType)) {
resourceEnv.setProperty(Constants.FACTORY, SystemComponentFactory.class.getName());
- resourceEnv.setProperty(COMPONENT_TYPE, HandleDelegate.class.getName());
+ resourceEnv.setProperty(NamingUtil.COMPONENT_TYPE, HandleDelegate.class.getName());
} else {
resourceEnv.setProperty(Constants.FACTORY, ResourceFactory.class.getName());
- resourceEnv.setProperty(NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ resourceEnv.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
if (ref.resourceID != null) {
- resourceEnv.setProperty(RESOURCE_ID, ref.resourceID);
+ resourceEnv.setProperty(NamingUtil.RESOURCE_ID, ref.resourceID);
}
if (ref.location != null) {
- resourceEnv.setProperty(JNDI_NAME, ref.location.jndiName);
- resourceEnv.setProperty(JNDI_PROVIDER_ID, ref.location.jndiProviderId);
+ resourceEnv.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
+ resourceEnv.setProperty(NamingUtil.JNDI_PROVIDER_ID, ref.location.jndiProviderId);
}
}
@@ -718,7 +692,7 @@ public class TomcatJndiBuilder {
}
resource.setProperty(Constants.FACTORY, WsFactory.class.getName());
- resource.setProperty(NAME, ref.referenceName.replaceAll("^comp/env/", ""));
+ resource.setProperty(NamingUtil.NAME, ref.referenceName.replaceAll("^comp/env/", ""));
if (ref.referenceType != null) {
resource.setType(ref.referenceType);
} else {
@@ -726,29 +700,29 @@ public class TomcatJndiBuilder {
}
if (ref.location != null) {
- resource.setProperty(JNDI_NAME, ref.location.jndiName);
- resource.setProperty(JNDI_PROVIDER_ID, ref.location.jndiProviderId);
+ resource.setProperty(NamingUtil.JNDI_NAME, ref.location.jndiName);
+ resource.setProperty(NamingUtil.JNDI_PROVIDER_ID, ref.location.jndiProviderId);
} else {
// ID
if (ref.id != null) {
- resource.setProperty(WS_ID, ref.id);
+ resource.setProperty(NamingUtil.WS_ID, ref.id);
}
// Service QName
if (ref.serviceQName != null) {
- resource.setProperty(WS_QNAME, ref.serviceQName.toString());
+ resource.setProperty(NamingUtil.WS_QNAME, ref.serviceQName.toString());
}
// Service Class
- resource.setProperty(WS_CLASS, ref.serviceType);
+ resource.setProperty(NamingUtil.WS_CLASS, ref.serviceType);
// Port QName
if (ref.portQName != null) {
- resource.setProperty(WS_PORT_QNAME, ref.portQName.toString());
+ resource.setProperty(NamingUtil.WS_PORT_QNAME, ref.portQName.toString());
}
// add the wsdl url
URL wsdlURL = getWsdlUrl(ref);
if (wsdlURL != null) {
- resource.setProperty(WSDL_URL, wsdlURL.toString());
+ resource.setProperty(NamingUtil.WSDL_URL, wsdlURL.toString());
}
// add port refs
@@ -829,11 +803,11 @@ public class TomcatJndiBuilder {
}
private void setResource(ContextResource resource, String name, Object object) {
- setStaticValue(new Resource(resource), name, object);
+ NamingUtil.setStaticValue(new Resource(resource), name, object);
}
private void setResource(ContextResource resource, Object object) {
- setStaticValue(new Resource(resource), object);
+ NamingUtil.setStaticValue(new Resource(resource), object);
}
public static void importOpenEJBResourcesInTomcat(final Collection<ResourceInfo> resources, final StandardServer server) {
@@ -848,7 +822,7 @@ public class TomcatJndiBuilder {
final ContextResource resource = new ContextResource();
resource.setName(name);
resource.setProperty(Constants.FACTORY, ResourceFactory.class.getName());
- resource.setProperty(NAME, name);
+ resource.setProperty(NamingUtil.NAME, name);
resource.setType(info.className);
resource.setAuth("Container");
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Thu Nov 28 14:08:38 2013
@@ -281,6 +281,7 @@ public class TomcatLoader implements Loa
cxfService.start();
services.add(cxfService);
} catch (ClassNotFoundException ignored) {
+ // no-op
} catch (Exception e) {
Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, getClass());
logger.error("Webservices failed to start", e);
@@ -293,6 +294,7 @@ public class TomcatLoader implements Loa
restService.start();
services.add(restService);
} catch (ClassNotFoundException ignored) {
+ // no-op
} catch (Exception e) {
logger.error("REST failed to start", e);
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatResourceFactory.java Thu Nov 28 14:08:38 2013
@@ -25,7 +25,6 @@ import javax.naming.CompositeName;
import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
-import javax.sql.DataSource;
public class TomcatResourceFactory {
private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, TomcatResourceFactory.class);
@@ -73,8 +72,6 @@ public class TomcatResourceFactory {
// context is null since it can't be used at this moment (see TomcatWebAppBuilder lifecycle)
return ((ObjectFactory) instance).getObjectInstance(reference, new CompositeName(jndiName), null, null);
}
- } else if (reference != null && DataSource.class.equals(reference.getClassName())) {
-
}
} catch (final Exception e) {
LOGGER.error("Can't create resource " + jndiName, e);
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Thu Nov 28 14:08:38 2013
@@ -726,8 +726,9 @@ public class TomcatWebAppBuilder impleme
}
}
+ @SuppressWarnings("PMD.UnusedFormalParameter")
private boolean isExtracted(final File extracted) {
- // do we want to delete it?
+ // TODO: do we want to delete it?
return false;
}
@@ -1330,7 +1331,7 @@ public class TomcatWebAppBuilder impleme
webContext.getBindings().putAll(appContext.getBindings());
webContext.getBindings().putAll(getJndiBuilder(classLoader, webAppInfo, injections).buildBindings(JndiEncBuilder.JndiScope.comp));
- final JavaeeInstanceManager instanceManager = new JavaeeInstanceManager(webContext, standardContext);
+ final JavaeeInstanceManager instanceManager = new JavaeeInstanceManager(webContext);
standardContext.setInstanceManager(instanceManager);
instanceManagers.put(classLoader, instanceManager);
standardContext.getServletContext().setAttribute(InstanceManager.class.getName(), standardContext.getInstanceManager());
@@ -2158,7 +2159,7 @@ public class TomcatWebAppBuilder impleme
*/
private CoreContainerSystem getContainerSystem() {
if (containerSystem == null) {
- containerSystem = (CoreContainerSystem) SystemInstance.get().getComponent(org.apache.openejb.spi.ContainerSystem.class);
+ containerSystem = (CoreContainerSystem) SystemInstance.get().getComponent(ContainerSystem.class);
}
return containerSystem;
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java Thu Nov 28 14:08:38 2013
@@ -17,10 +17,7 @@
package org.apache.tomee.catalina;
import org.apache.openejb.config.TldScanner;
-import org.apache.openejb.jee.JaxbJavaee;
-import org.apache.openejb.jee.WebApp;
-import javax.xml.bind.JAXBException;
import java.util.concurrent.Semaphore;
/**
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListener.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListener.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListener.java Thu Nov 28 14:08:38 2013
@@ -24,6 +24,6 @@ import org.apache.openejb.assembler.clas
*/
public interface WebDeploymentListener {
- public void afterApplicationCreated(final AppInfo appInfo,final WebAppInfo webApp);
+ void afterApplicationCreated(final AppInfo appInfo,final WebAppInfo webApp);
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListeners.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListeners.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListeners.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebDeploymentListeners.java Thu Nov 28 14:08:38 2013
@@ -16,11 +16,6 @@
*/
package org.apache.tomee.catalina;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.WebAppInfo;
-
-import java.util.ArrayList;
-import java.util.List;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.observer.Observes;
import org.apache.openejb.util.LogCategory;
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionContextBackedByHttpSession.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionContextBackedByHttpSession.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionContextBackedByHttpSession.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionContextBackedByHttpSession.java Thu Nov 28 14:08:38 2013
@@ -44,6 +44,7 @@ public class SessionContextBackedByHttpS
setComponentSessionInstanceMap(); // override default map (set in super())
}
+ @SuppressWarnings("unchecked")
public void setComponentSessionInstanceMap() {
if (session == null) {
super.setComponentInstanceMap();
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionNormalScopeBeanHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionNormalScopeBeanHandler.java?rev=1546367&r1=1546366&r2=1546367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionNormalScopeBeanHandler.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/SessionNormalScopeBeanHandler.java Thu Nov 28 14:08:38 2013
@@ -86,6 +86,7 @@ public class SessionNormalScopeBeanHandl
this.value = value;
}
+ @SuppressWarnings("unchecked")
protected void updateBean() {
final HttpSession session = session();
if (session == null) {